diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index 9e7c3c89f2ea55508159ff6c27dfa6f2c72f6598..ffc4c409b5421be9f093f061cc8d219c2447ab70 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -1,51 +1,52 @@
 # Creates the variables for setting up GFM auto-completion
 
 window.GitLab ?= {}
-window.GitLab.AutoComplete ?= {}
+GitLab.GfmAutoComplete ?= {}
 
 # Emoji
 data      = []
 template  = "<li data-value='${insert}'>${name} <img alt='${name}' height='20' src='${image}' width='20' /></li>"
-window.GitLab.AutoComplete.Emoji = {data, template}
+GitLab.GfmAutoComplete.Emoji = {data, template}
 
 # Team Members
+data      = []
 url     = '';
 params  = {private_token: '', page: 1}
-window.GitLab.AutoComplete.Members = {data, url, params}
+GitLab.GfmAutoComplete.Members = {data, url, params}
 
 # Add GFM auto-completion to all input fields, that accept GFM input.
-window.setupGfmAutoComplete = ->
+GitLab.GfmAutoComplete.setup = ->
   input = $('.js-gfm-input')
 
   # Emoji
   input.atWho ':',
-    data: GitLab.AutoComplete.Emoji.data,
-    tpl: GitLab.AutoComplete.Emoji.template
+    data: GitLab.GfmAutoComplete.Emoji.data,
+    tpl: GitLab.GfmAutoComplete.Emoji.template
 
   # Team Members
   input.atWho '@', (query, callback) ->
     (getMoreMembers = ->
-      $.getJSON(GitLab.AutoComplete.Members.url, GitLab.AutoComplete.Members.params)
+      $.getJSON(GitLab.GfmAutoComplete.Members.url, GitLab.GfmAutoComplete.Members.params)
         .success (members) ->
           # pick the data we need
           newMembersData = $.map(members, (m) -> m.name )
 
           # add the new page of data to the rest
-          $.merge(GitLab.AutoComplete.Members.data, newMembersData)
+          $.merge(GitLab.GfmAutoComplete.Members.data, newMembersData)
 
           # show the pop-up with a copy of the current data
-          callback(GitLab.AutoComplete.Members.data[..])
+          callback(GitLab.GfmAutoComplete.Members.data[..])
 
           # are we past the last page?
           if newMembersData.length is 0
             # set static data and stop callbacks
             input.atWho '@',
-              data: GitLab.AutoComplete.Members.data
+              data: GitLab.GfmAutoComplete.Members.data
               callback: null
           else
             # get next page
             getMoreMembers()
 
       # so the next request gets the next page
-      GitLab.AutoComplete.Members.params.page += 1
+      GitLab.GfmAutoComplete.Members.params.page += 1
     ).call()
diff --git a/app/assets/javascripts/issues.js b/app/assets/javascripts/issues.js
index 55db72c39f0b6591be4418cdc8620d33f39ec858..e2fe107590321496a283ed485e0b07da17d3d97d 100644
--- a/app/assets/javascripts/issues.js
+++ b/app/assets/javascripts/issues.js
@@ -5,7 +5,7 @@ function switchToNewIssue(){
     $("#new_issue_dialog").show("fade", { direction: "right" }, 150);
     $('.top-tabs .add_new').hide();
     disableButtonIfEmptyField("#issue_title", ".save-btn");
-    setupGfmAutoComplete();
+    GitLab.GfmAutoComplete.setup();
   });
 }
 
@@ -16,7 +16,7 @@ function switchToEditIssue(){
     $("#edit_issue_dialog").show("fade", { direction: "right" }, 150);
     $('.add_new').hide();
     disableButtonIfEmptyField("#issue_title", ".save-btn");
-    setupGfmAutoComplete();
+    GitLab.GfmAutoComplete.setup();
   });
 }
 
diff --git a/app/views/layouts/_init_auto_complete.html.haml b/app/views/layouts/_init_auto_complete.html.haml
index 225c378f626f53f4f2c238982943a883f6dea554..502f289ec05bf4ea426c7518c12cc56023df0a46 100644
--- a/app/views/layouts/_init_auto_complete.html.haml
+++ b/app/views/layouts/_init_auto_complete.html.haml
@@ -1,11 +1,11 @@
 :javascript
   $(function() {
-    GitLab.AutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.code}/members" if @project }";
-    GitLab.AutoComplete.Members.params.private_token = "#{current_user.private_token}";
+    GitLab.GfmAutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.code}/members" if @project }";
+    GitLab.GfmAutoComplete.Members.params.private_token = "#{current_user.private_token}";
 
-    GitLab.AutoComplete.Emoji.data = #{raw emoji_autocomplete_source};
+    GitLab.GfmAutoComplete.Emoji.data = #{raw emoji_autocomplete_source};
     // convert the list so that the items have the right format for completion
-    GitLab.AutoComplete.Emoji.data = $.map(GitLab.AutoComplete.Emoji.data, function(value) {
+    GitLab.GfmAutoComplete.Emoji.data = $.map(GitLab.GfmAutoComplete.Emoji.data, function(value) {
       return {
         name: value,
         insert: value+':',
@@ -13,5 +13,5 @@
       }
     });
 
-    setupGfmAutoComplete();
+    GitLab.GfmAutoComplete.setup();
   });
diff --git a/app/views/notes/_create_common_note.js.haml b/app/views/notes/_create_common_note.js.haml
index e7df64c4c1e7e3ca0020a8d1da1c28ca924adb31..a96cc7b3a8cab4379c608fe32acfdee96d6529e9 100644
--- a/app/views/notes/_create_common_note.js.haml
+++ b/app/views/notes/_create_common_note.js.haml
@@ -10,5 +10,5 @@
 - else
   :plain
     $(".note-form-holder").replaceWith("#{escape_javascript(render 'form')}");
-    setupGfmAutoComplete();
 
+    GitLab.GfmAutoComplete.setup();