diff --git a/manifests/params.pp b/manifests/params.pp
index d874f2c..3885c07 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -42,7 +42,7 @@ class postgresql::params inherits postgresql::globals {
         $service_name           = pick($service_name, 'postgresql')
         $bindir                 = pick($bindir, '/usr/bin')
         $datadir                = $::operatingsystem ? {
-          'Amazon' => pick($datadir, '/var/lib/pgsql9/data'),
+          'Amazon' => pick($datadir, "/var/lib/pgsql${package_version}/data"),
           default  => pick($datadir, '/var/lib/pgsql/data'),
         }
         $confdir                = pick($confdir, $datadir)
@@ -55,10 +55,16 @@ class postgresql::params inherits postgresql::globals {
         $docs_package_name      = pick($docs_package_name, "postgresql${package_version}-docs")
         $plperl_package_name    = pick($plperl_package_name, "postgresql${package_version}-plperl")
         $plpython_package_name  = pick($plpython_package_name, "postgresql${package_version}-plpython")
-        $service_name           = pick($service_name, "postgresql-${version}")
-        $bindir                 = pick($bindir, "/usr/pgsql-${version}/bin")
+        $service_name           = $::operatingsystem ? {
+          'Amazon' => pick($service_name, "postgresql${version}"),
+          default  => pick($service_name, "postgresql-${version}"),
+        }
+        $bindir                 = $::operatingsystem ? {
+          'Amazon' => pick($bindir, '/usr/bin'),
+          default  => pick($bindir, "/usr/pgsql-${version}/bin"),
+        }
         $datadir                = $::operatingsystem ? {
-          'Amazon' => pick($datadir, "/var/lib/pgsql9/${version}/data"),
+          'Amazon' => pick($datadir, "/var/lib/pgsql${package_version}/data"),
           default  => pick($datadir, "/var/lib/pgsql/${version}/data"),
         }
         $confdir                = pick($confdir, $datadir)
diff --git a/spec/unit/classes/server/initdb_spec.rb b/spec/unit/classes/server/initdb_spec.rb
index ab7632d..5ddfb70 100644
--- a/spec/unit/classes/server/initdb_spec.rb
+++ b/spec/unit/classes/server/initdb_spec.rb
@@ -30,7 +30,7 @@ describe 'postgresql::server::initdb', :type => :class do
         :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
-    it { is_expected.to contain_file('/var/lib/pgsql9/data').with_ensure('directory') }
+    it { is_expected.to contain_file('/var/lib/pgsql92/data').with_ensure('directory') }
   end
 end