diff --git a/marionette.application.sublime-snippet b/marionette.application.sublime-snippet
index 482895f..d8fd87f 100644
--- a/marionette.application.sublime-snippet
+++ b/marionette.application.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[
-${1:appName} = new Backbone.Marionette.Application();
+${1:MyApp} = new Backbone.Marionette.Application();
 ]]></content>
     <tabTrigger>bma</tabTrigger>
     <scope>source.js</scope>
diff --git a/marionette.approuter.sublime-snippet b/marionette.approuter.sublime-snippet
index 9fa75bd..86cdbb9 100644
--- a/marionette.approuter.sublime-snippet
+++ b/marionette.approuter.sublime-snippet
@@ -1,6 +1,10 @@
 <snippet>
     <content><![CDATA[
-Backbone.Marionette.AppRouter.extend({appRoutes:{${0:properties}}});
+${1:MyRouter} = Backbone.Marionette.AppRouter.extend({
+  appRoutes:{
+    "some/route": "someMethod"
+  }
+});
 ]]></content>
     <tabTrigger>bmar</tabTrigger>
     <scope>source.js</scope>
diff --git a/marionette.itemview.sublime-snippet b/marionette.itemview.sublime-snippet
index f1562f9..a5b7468 100644
--- a/marionette.itemview.sublime-snippet
+++ b/marionette.itemview.sublime-snippet
@@ -1,6 +1,8 @@
 <snippet>
     <content><![CDATA[
-${1:viewName} = Backbone.Marionette.ItemView.extend({${0:properties}});
+${1:MyView} = Backbone.Marionette.ItemView.extend({
+  template: "#some-template"
+});
 ]]></content>
     <tabTrigger>bmiv</tabTrigger>
     <scope>source.js</scope>
diff --git a/marionette.module.sublime-snippet b/marionette.module.sublime-snippet
index 4300738..0d2320d 100644
--- a/marionette.module.sublime-snippet
+++ b/marionette.module.sublime-snippet
@@ -1,10 +1,8 @@
 <snippet>
     <content><![CDATA[
-${1:appName}.module("${2:moduleName}", function(${2:moduleName}, ${1:appName}, Backbone, Marionette, $, _){
-   
+${1:MyApp}.module("${2:MyModule}", function($2, $1, Backbone, Marionette, \$, _){
     // Private Data And Functions
     // --------------------------
-
     var myData = "this is private data";
 
     var myFunction = function(){
@@ -13,15 +11,14 @@ ${1:appName}.module("${2:moduleName}", function(${2:moduleName}, ${1:appName}, B
 
     // Public Data And Functions
     // -------------------------
-    
-    ${2:moduleName}.someData = "public data";
+    $2.someData = "public data";
 
-    ${2:moduleName}.someFunction = function(){
-      console.log(${moduleName}.someData);
+    $2.someFunction = function(){
+      console.log($2.someData);
     };
 });
 ]]></content>
     <tabTrigger>bmm</tabTrigger>
     <scope>source.js,source.js.embedded.html</scope>
-    <description>Backbone.Marionette.Application.Module skeleton</description>
+    <description>Backbone.Marionette.Application.module skeleton</description>
 </snippet>
\ No newline at end of file
diff --git a/marionette.region.sublime-snippet b/marionette.region.sublime-snippet
index 9bfa723..c61c5eb 100644
--- a/marionette.region.sublime-snippet
+++ b/marionette.region.sublime-snippet
@@ -1,6 +1,8 @@
 <snippet>
     <content><![CDATA[
-${1:appName}.addRegions({${0:properties}});
+${1:MyApp}.addRegions({
+  foo: "#foo"
+});
 ]]></content>
     <tabTrigger>bmr</tabTrigger>
     <scope>source.js</scope>
diff --git a/marionette.sublime-completions b/marionette.sublime-completions
index fd47e4e..4632814 100644
--- a/marionette.sublime-completions
+++ b/marionette.sublime-completions
@@ -4,6 +4,21 @@
         "completions":
         [
                 "Marionette",
+                "Backbone.Marionette",
+                "Marionette.Application",
+                "Marionette.AppRouter",
+                "Marionette.View",
+                "Marionette.ItemView",
+                "Marionette.CollectionView",
+                "Marionette.CompositeView",
+                "Marionette.Layout",
+                "Marionette.Region",
+                "Marionette.EventAggregator",
+                "Marionette.BindTo",
+                "Marionette.Renderer",
+                "Marionette.TemplateCache",
+                "Marionette.Callbacks",
+
                 "Application",
                 "AppRouter",
                 "View",
diff --git a/marionette_coffee.application.sublime-snippet b/marionette_coffee.application.sublime-snippet
index 56388fb..a2a6de7 100644
--- a/marionette_coffee.application.sublime-snippet
+++ b/marionette_coffee.application.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
     <content><![CDATA[
-${1:appName} = new Backbone.Marionette.Application()
+${1:MyApp} = new Backbone.Marionette.Application()
 ]]></content>
     <tabTrigger>bmac</tabTrigger>
     <scope>source.coffee</scope>
diff --git a/marionette_coffee.approuter.sublime-snippet b/marionette_coffee.approuter.sublime-snippet
index f7fcd28..1a30df7 100644
--- a/marionette_coffee.approuter.sublime-snippet
+++ b/marionette_coffee.approuter.sublime-snippet
@@ -1,8 +1,9 @@
 <snippet>
     <content><![CDATA[
-${1:name} extends Backbone.Marionette.AppRouter() ->
-  #appRoutes:
-    #"some/route": "someMethod"
+${1:MyRouter} = Backbone.Marionette.AppRouter.extend(
+  appRoutes:
+    "some/route": "someMethod"
+)
 ]]></content>
     <tabTrigger>bmarc</tabTrigger>
     <scope>source.coffee</scope>
diff --git a/marionette_coffee.itemview.sublime-snippet b/marionette_coffee.itemview.sublime-snippet
index 5294500..1c40dc3 100644
--- a/marionette_coffee.itemview.sublime-snippet
+++ b/marionette_coffee.itemview.sublime-snippet
@@ -1,7 +1,6 @@
 <snippet>
     <content><![CDATA[
-${1:viewName} extends Backbone.Marionette.ItemView ->
-  ${0:properties}
+${1:MyView} = Backbone.Marionette.ItemView.extend(template: "#some-template")
 ]]></content>
     <tabTrigger>bmic</tabTrigger>
     <scope>source.coffee</scope>
diff --git a/marionette_coffee.model.sublime-snippet b/marionette_coffee.model.sublime-snippet
deleted file mode 100644
index e1dbdbc..0000000
--- a/marionette_coffee.model.sublime-snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-<snippet>
-    <content><![CDATA[
-Backbone.Model
-]]></content>
-    <tabTrigger>bm</tabTrigger>
-    <scope>source.coffee</scope>
-    <description>Backbone Model</description>
-</snippet>
\ No newline at end of file
diff --git a/marionette_coffee.module.sublime-snippet b/marionette_coffee.module.sublime-snippet
index 6134e35..59e9e7f 100644
--- a/marionette_coffee.module.sublime-snippet
+++ b/marionette_coffee.module.sublime-snippet
@@ -1,7 +1,6 @@
 <snippet>
     <content><![CDATA[
-${1:appName}.module("${2:moduleName}", (${2:moduleName}, ${1:appName}, Backbone, Marionette, $, _) ->
-   
+${1:MyApp}.module("${2:MyModule}", ($2, $1, Backbone, Marionette, \$, _) ->
     # Private Data And Functions
     # --------------------------
 
@@ -13,12 +12,13 @@ ${1:appName}.module("${2:moduleName}", (${2:moduleName}, ${1:appName}, Backbone,
     # Public Data And Functions
     # -------------------------
     
-    ${2:moduleName}.someData = "public data"
+    $2.someData = "public data"
 
-    ${2:moduleName}.someFunction = () ->
-      console.log(${moduleName}.someData)
+    $2.someFunction = () ->
+      console.log($2.someData)
+)
 ]]></content>
     <tabTrigger>bmmc</tabTrigger>
     <scope>source.coffee</scope>
-    <description>Backbone.Marionette.Application.Module skeleton</description>
+    <description>Backbone.Marionette.Application.module skeleton</description>
 </snippet>
\ No newline at end of file
diff --git a/marionette_coffee.region.sublime-snippet b/marionette_coffee.region.sublime-snippet
index 53b4af8..4276be8 100644
--- a/marionette_coffee.region.sublime-snippet
+++ b/marionette_coffee.region.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
     <content><![CDATA[
-${1:appName}.addRegions ->
-  ${0:properties}
+${0:MyApp}.addRegions ->
+  foo: "#foo"
 ]]></content>
     <tabTrigger>bmrc</tabTrigger>
     <scope>source.coffee</scope>