diff --git a/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb b/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb
index ba60083..2670098 100644
--- a/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb
+++ b/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb
@@ -21,7 +21,7 @@ require 'chef/json_compat'
 require 'chef/mixin/deep_merge'
 require 'securerandom'
 
-module ChefServer
+module GitLab
   extend(Mixlib::Config)
 
   postgresql Mash.new
@@ -36,41 +36,40 @@ module ChefServer
 
     def generate_secrets(node_name)
       existing_secrets ||= Hash.new
-      if File.exists?("/etc/chef-server/chef-server-secrets.json")
-        existing_secrets = Chef::JSONCompat.from_json(File.read("/etc/chef-server/chef-server-secrets.json"))
+      if File.exists?("/etc/gitlab/gitlab-secrets.json")
+        existing_secrets = Chef::JSONCompat.from_json(File.read("/etc/gitlab/gitlab-secrets.json"))
       end
       existing_secrets.each do |k, v|
         v.each do |pk, p|
-          ChefServer[k][pk] = p
+          GitLab[k][pk] = p
         end
       end
 
-      ChefServer['chef_server_webui']['cookie_secret'] ||= generate_hex(50)
-      ChefServer['postgresql']['sql_password'] ||= generate_hex(50)
-      ChefServer['postgresql']['sql_ro_password'] ||= generate_hex(50)
+      GitLab['postgresql']['sql_password'] ||= generate_hex(50)
+      GitLab['postgresql']['sql_ro_password'] ||= generate_hex(50)
 
-      if File.directory?("/etc/chef-server")
-        File.open("/etc/chef-server/chef-server-secrets.json", "w") do |f|
+      if File.directory?("/etc/gitlab")
+        File.open("/etc/gitlab/gitlab-secrets.json", "w") do |f|
           f.puts(
             Chef::JSONCompat.to_json_pretty({
               'postgresql' => {
-                'sql_password' => ChefServer['postgresql']['sql_password'],
-                'sql_ro_password' => ChefServer['postgresql']['sql_ro_password']
+                'sql_password' => GitLab['postgresql']['sql_password'],
+                'sql_ro_password' => GitLab['postgresql']['sql_ro_password']
               },
             })
           )
-          system("chmod 0600 /etc/chef-server/chef-server-secrets.json")
+          system("chmod 0600 /etc/gitlab/gitlab-secrets.json")
         end
       end
     end
 
     def generate_hash
-      results = { "chef_server" => {} }
+      results = { "gitlab" => {} }
       [
         "postgresql"
       ].each do |key|
         rkey = key.gsub('_', '-')
-        results['chef_server'][rkey] = ChefServer[key]
+        results['gitlab'][rkey] = GitLab[key]
       end
 
       results
diff --git a/files/gitlab-cookbooks/gitlab/libraries/helper.rb b/files/gitlab-cookbooks/gitlab/libraries/helper.rb
index c702aec..e0fd9aa 100644
--- a/files/gitlab-cookbooks/gitlab/libraries/helper.rb
+++ b/files/gitlab-cookbooks/gitlab/libraries/helper.rb
@@ -35,13 +35,13 @@ class PgHelper
   end
 
   def sql_user_exists?
-    user_exists?(node['chef_server']['postgresql']['sql_user'])
+    user_exists?(node['gitlab']['postgresql']['sql_user'])
   end
 
   def sql_ro_user_exists?
-    user_exists?(node['chef_server']['postgresql']['sql_ro_user'])
+    user_exists?(node['gitlab']['postgresql']['sql_ro_user'])
   end
-  
+
   def user_exists?(db_user)
     psql_cmd(["-d 'template1'",
               "-c 'select usename from pg_user' -x",
@@ -49,20 +49,20 @@ class PgHelper
   end
 
   def psql_cmd(cmd_list)
-    cmd = ["/opt/chef-server/embedded/bin/chpst",
+    cmd = ["/opt/gitlab/embedded/bin/chpst",
            "-u #{pg_user}",
-           "/opt/chef-server/embedded/bin/psql",
+           "/opt/gitlab/embedded/bin/psql",
            "--port #{pg_port}",
            cmd_list.join(" ")].join(" ")
     do_shell_out(cmd, 0)
   end
 
   def pg_user
-    node['chef_server']['postgresql']['username']
+    node['gitlab']['postgresql']['username']
   end
 
   def pg_port
-    node['chef_server']['postgresql']['port']
+    node['gitlab']['postgresql']['port']
   end
 
   def do_shell_out(cmd, expect_status)
--
libgit2 0.21.2