diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
index e8893bf786..4466f200c6 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
@@ -1,9 +1,9 @@
 define [
-	"ide/editor/directives/aceEditor/auto-complete/SuggestionManager"
-	"ide/editor/directives/aceEditor/auto-complete/SnippetManager"
+	"ide/editor/directives/aceEditor/auto-complete/CommandManager"
+	"ide/editor/directives/aceEditor/auto-complete/EnvironmentManager"
 	"ace/ace"
 	"ace/ext-language_tools"
-], (SuggestionManager, SnippetManager) ->
+], (CommandManager, EnvironmentManager) ->
 	Range = ace.require("ace/range").Range
 	aceSnippetManager = ace.require('ace/snippets').snippetManager
 
@@ -18,7 +18,7 @@ define [
 
 	class AutoCompleteManager
 		constructor: (@$scope, @editor, @element, @labelsManager) ->
-			@suggestionManager = new SuggestionManager()
+			@suggestionManager = new CommandManager()
 
 			@monkeyPatchAutocomplete()
 
@@ -42,7 +42,7 @@ define [
 				enableLiveAutocompletion: false
 			})
 
-			SnippetCompleter = new SnippetManager()
+			SnippetCompleter = new EnvironmentManager()
 
 			labelsManager = @labelsManager
 			LabelsCompleter =
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/SuggestionManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/CommandManager.coffee
similarity index 99%
rename from services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/SuggestionManager.coffee
rename to services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/CommandManager.coffee
index a139f8fa8c..0a202a7793 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/SuggestionManager.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/CommandManager.coffee
@@ -159,7 +159,7 @@ define [], () ->
 			else
 				return false
 
-	class SuggestionManager
+	class CommandManager
 		getCompletions: (editor, session, pos, prefix, callback) ->
 			doc = session.getValue()
 			parser = new Parser(doc, prefix)
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/SnippetManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/EnvironmentManager.coffee
similarity index 98%
rename from services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/SnippetManager.coffee
rename to services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/EnvironmentManager.coffee
index 6bbb25f59e..04152cfbd9 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/SnippetManager.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/EnvironmentManager.coffee
@@ -129,7 +129,7 @@ define () ->
 				return result
 		return result
 
-	class SnippetManager
+	class EnvironmentManager
 		getCompletions: (editor, session, pos, prefix, callback) ->
 			docText = session.getValue()
 			customEnvironments = parseCustomEnvironments(docText)
@@ -164,4 +164,4 @@ define () ->
 			)
 			callback null, snippets
 
-	return SnippetManager
+	return EnvironmentManager