diff --git a/manifests/server/config.pp b/manifests/server/config.pp
index 700c3d752b..bd232e1bac 100644
--- a/manifests/server/config.pp
+++ b/manifests/server/config.pp
@@ -1,6 +1,6 @@
 # @api private
 class postgresql::server::config {
-  postgresql::server::instance_config { 'main':
+  postgresql::server::instance::config { 'main':
     ip_mask_deny_postgres_user   => $postgresql::server::ip_mask_deny_postgres_user,
     ip_mask_allow_all_users      => $postgresql::server::ip_mask_allow_all_users,
     listen_addresses             => $postgresql::server::listen_addresses,
diff --git a/manifests/server/initdb.pp b/manifests/server/initdb.pp
index 1dc1566027..937406d47a 100644
--- a/manifests/server/initdb.pp
+++ b/manifests/server/initdb.pp
@@ -1,6 +1,6 @@
 # @api private
 class postgresql::server::initdb {
-  postgresql::server::instance_initdb { 'main':
+  postgresql::server::instance::initdb { 'main':
     needs_initdb   => $postgresql::server::needs_initdb,
     initdb_path    => $postgresql::server::initdb_path,
     datadir        => $postgresql::server::datadir,
diff --git a/manifests/server/instance_config.pp b/manifests/server/instance/config.pp
similarity index 99%
rename from manifests/server/instance_config.pp
rename to manifests/server/instance/config.pp
index 8fb5794dfc..72189c025c 100644
--- a/manifests/server/instance_config.pp
+++ b/manifests/server/instance/config.pp
@@ -33,7 +33,7 @@
 # @param timezone Set timezone for the PostgreSQL instance
 # @param extra_systemd_config Adds extra config to systemd config file, can for instance be used to add extra openfiles. This can be a multi line string
 # lint:endignore:140chars
-define postgresql::server::instance_config (
+define postgresql::server::instance::config (
   $ip_mask_deny_postgres_user                      = $postgresql::server::ip_mask_deny_postgres_user,
   $ip_mask_allow_all_users                         = $postgresql::server::ip_mask_allow_all_users,
   $listen_addresses                                = $postgresql::server::listen_addresses,
diff --git a/manifests/server/instance_initdb.pp b/manifests/server/instance/initdb.pp
similarity index 99%
rename from manifests/server/instance_initdb.pp
rename to manifests/server/instance/initdb.pp
index 673ecb022f..7ec5b19b39 100644
--- a/manifests/server/instance_initdb.pp
+++ b/manifests/server/instance/initdb.pp
@@ -18,7 +18,7 @@
 # @param group Overrides the default postgres user group to be used for related files in the file system.
 # @param module_workdir Working directory for the PostgreSQL module
 # lint:endignore:140chars
-define postgresql::server::instance_initdb (
+define postgresql::server::instance::initdb (
   Boolean $needs_initdb             = $postgresql::server::needs_initdb,
   $initdb_path                      = $postgresql::server::initdb_path,
   $datadir                          = $postgresql::server::datadir,
diff --git a/manifests/server/instance_late_initdb.pp b/manifests/server/instance/late_initdb.pp
similarity index 97%
rename from manifests/server/instance_late_initdb.pp
rename to manifests/server/instance/late_initdb.pp
index 45f441915a..90012a72fb 100644
--- a/manifests/server/instance_late_initdb.pp
+++ b/manifests/server/instance/late_initdb.pp
@@ -7,7 +7,7 @@
 # @param port Specifies the port for the PostgreSQL server to listen on. Note: The same port number is used for all IP addresses the server listens on. Also, for Red Hat systems and early Debian systems, changing the port causes the server to come to a full stop before being able to make the change.
 # @param module_workdir Working directory for the PostgreSQL module
 # lint:endignore:140chars
-define postgresql::server::instance_late_initdb (
+define postgresql::server::instance::late_initdb (
   $encoding       = $postgresql::server::encoding,
   $user           = $postgresql::server::user,
   $group          = $postgresql::server::group,
diff --git a/manifests/server/instance_passwd.pp b/manifests/server/instance/passwd.pp
similarity index 98%
rename from manifests/server/instance_passwd.pp
rename to manifests/server/instance/passwd.pp
index c3ea8e218a..5d98d5e572 100644
--- a/manifests/server/instance_passwd.pp
+++ b/manifests/server/instance/passwd.pp
@@ -8,7 +8,7 @@
 # @param module_workdir Working directory for the PostgreSQL module
 # @param postgres_password Sets the password for the postgres user to your specified value. By default, this setting uses the superuser account in the Postgres database, with a user called postgres and no password.
 # lint:endignore:140chars
-define postgresql::server::instance_passwd (
+define postgresql::server::instance::passwd (
   $user                                           = $postgresql::server::user,
   $group                                          = $postgresql::server::group,
   $psql_path                                      = $postgresql::server::psql_path,
diff --git a/manifests/server/instance_reload.pp b/manifests/server/instance/reload.pp
similarity index 92%
rename from manifests/server/instance_reload.pp
rename to manifests/server/instance/reload.pp
index ce63ecc864..8d81a33487 100644
--- a/manifests/server/instance_reload.pp
+++ b/manifests/server/instance/reload.pp
@@ -1,6 +1,6 @@
 # @param service_reload Overrides the default reload command for your PostgreSQL service.
 # @param service_status Overrides the default status check command for your PostgreSQL service.
-define postgresql::server::instance_reload (
+define postgresql::server::instance::reload (
   $service_status = $postgresql::server::service_status,
   $service_reload = $postgresql::server::service_reload,
 ) {
diff --git a/manifests/server/instance_service.pp b/manifests/server/instance/service.pp
similarity index 98%
rename from manifests/server/instance_service.pp
rename to manifests/server/instance/service.pp
index 050045eacc..cd5e37e61c 100644
--- a/manifests/server/instance_service.pp
+++ b/manifests/server/instance/service.pp
@@ -12,7 +12,7 @@
 # @param psql_path Specifies the path to the psql command.
 # @param default_connect_settings Specifies a hash of environment variables used when connecting to a remote server. Becomes the default for other defined types, such as postgresql::server::role.
 # lint:endignore:140chars
-define postgresql::server::instance_service (
+define postgresql::server::instance::service (
   $service_ensure   = $postgresql::server::service_ensure,
   $service_enable   = $postgresql::server::service_enable,
   $service_manage   = $postgresql::server::service_manage,
diff --git a/manifests/server/late_initdb.pp b/manifests/server/late_initdb.pp
index dfedd3e83e..d0fa68c0a7 100644
--- a/manifests/server/late_initdb.pp
+++ b/manifests/server/late_initdb.pp
@@ -4,7 +4,7 @@
 class postgresql::server::late_initdb {
   assert_private()
 
-  postgresql::server::instance_late_initdb { 'main':
+  postgresql::server::instance::late_initdb { 'main':
     encoding       => $postgresql::server::encoding,
     user           => $postgresql::server::user,
     group          => $postgresql::server::group,
diff --git a/manifests/server/passwd.pp b/manifests/server/passwd.pp
index 3a7879bef4..e30beef032 100644
--- a/manifests/server/passwd.pp
+++ b/manifests/server/passwd.pp
@@ -1,6 +1,6 @@
 # @api private
 class postgresql::server::passwd {
-  postgresql::server::instance_passwd { 'main':
+  postgresql::server::instance::passwd { 'main':
     user              => $postgresql::server::user,
     group             => $postgresql::server::group,
     psql_path         => $postgresql::server::psql_path,
diff --git a/manifests/server/reload.pp b/manifests/server/reload.pp
index babc2dbad7..be5e7576d3 100644
--- a/manifests/server/reload.pp
+++ b/manifests/server/reload.pp
@@ -1,6 +1,6 @@
 # @api private
 class postgresql::server::reload {
-  postgresql::server::instance_reload { 'main':
+  postgresql::server::instance::reload { 'main':
     service_status => $postgresql::server::service_status,
     service_reload => $postgresql::server::service_reload,
   }
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index 883d1420f5..174e550790 100644
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -1,6 +1,6 @@
 # @api private
 class postgresql::server::service {
-  postgresql::server::instance_service { 'main':
+  postgresql::server::instance::service { 'main':
     service_ensure   => $postgresql::server::service_ensure,
     service_enable   => $postgresql::server::service_enable,
     service_manage   => $postgresql::server::service_manage,
diff --git a/spec/defines/server/instance_config.rb b/spec/defines/server/instance/config.rb
similarity index 88%
rename from spec/defines/server/instance_config.rb
rename to spec/defines/server/instance/config.rb
index 8fa49eac71..aeab03dee2 100644
--- a/spec/defines/server/instance_config.rb
+++ b/spec/defines/server/instance/config.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_config' do
+describe 'postgresql::server::instance::config' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|
diff --git a/spec/defines/server/instance_initdb.rb b/spec/defines/server/instance/initdb.rb
similarity index 88%
rename from spec/defines/server/instance_initdb.rb
rename to spec/defines/server/instance/initdb.rb
index d82a3d37be..7b94bba521 100644
--- a/spec/defines/server/instance_initdb.rb
+++ b/spec/defines/server/instance/initdb.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_initdb' do
+describe 'postgresql::server::instance::initdb' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|
diff --git a/spec/defines/server/instance_late_initdb.rb b/spec/defines/server/instance/late_initdb.rb
similarity index 87%
rename from spec/defines/server/instance_late_initdb.rb
rename to spec/defines/server/instance/late_initdb.rb
index d00e04f358..354a410f6f 100644
--- a/spec/defines/server/instance_late_initdb.rb
+++ b/spec/defines/server/instance/late_initdb.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_late_initdb' do
+describe 'postgresql::server::instance::late_initdb' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|
diff --git a/spec/defines/server/instance_passwd.rb b/spec/defines/server/instance/passwd.rb
similarity index 88%
rename from spec/defines/server/instance_passwd.rb
rename to spec/defines/server/instance/passwd.rb
index 4558b627e7..74ad978be2 100644
--- a/spec/defines/server/instance_passwd.rb
+++ b/spec/defines/server/instance/passwd.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_passwd' do
+describe 'postgresql::server::instance::passwd' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|
diff --git a/spec/defines/server/instance_reload.rb b/spec/defines/server/instance/reload.rb
similarity index 88%
rename from spec/defines/server/instance_reload.rb
rename to spec/defines/server/instance/reload.rb
index e7ecac8e5f..2b37638401 100644
--- a/spec/defines/server/instance_reload.rb
+++ b/spec/defines/server/instance/reload.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_reload' do
+describe 'postgresql::server::instance::reload' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|
diff --git a/spec/defines/server/instance_service.rb b/spec/defines/server/instance/service.rb
similarity index 88%
rename from spec/defines/server/instance_service.rb
rename to spec/defines/server/instance/service.rb
index 63320845fd..ef5ad5f1e9 100644
--- a/spec/defines/server/instance_service.rb
+++ b/spec/defines/server/instance/service.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'postgresql::server::instance_service' do
+describe 'postgresql::server::instance::service' do
   let(:title) { 'main' }
 
   on_supported_os.each do |os, os_facts|