Keep a more consistent nomenclature for the main concepts in the code to avoid confusion.

Binding: the actual binding between a model attribute and DOM element.
Routine: the function that performs the actual binding to the element.
Model: Same as what context object was.

@@ -8,17 +8,17 @@
 
 
   Rivets.Binding = (function() {
   Rivets.Binding = (function() {
 
 
-    function Binding(el, type, context, keypath, formatters) {
+    function Binding(el, type, model, keypath, formatters) {
       this.el = el;
       this.el = el;
       this.type = type;
       this.type = type;
-      this.context = context;
+      this.model = model;
       this.keypath = keypath;
       this.keypath = keypath;
       this.formatters = formatters != null ? formatters : [];
       this.formatters = formatters != null ? formatters : [];
       this.bind = __bind(this.bind, this);
       this.bind = __bind(this.bind, this);
 
 
       this.set = __bind(this.set, this);
       this.set = __bind(this.set, this);
 
 
-      this.routine = Rivets.bindings[this.type] || attributeBinding(this.type);
+      this.routine = Rivets.routines[this.type] || attributeBinding(this.type);
     }
     }
 
 
     Binding.prototype.set = function(value) {
     Binding.prototype.set = function(value) {
@@ -34,17 +34,17 @@
     Binding.prototype.bind = function() {
     Binding.prototype.bind = function() {
       var _ref,
       var _ref,
         _this = this;
         _this = this;
-      Rivets.config.adapter.subscribe(this.context, this.keypath, function(value) {
+      Rivets.config.adapter.subscribe(this.model, this.keypath, function(value) {
         return _this.set(value);
         return _this.set(value);
       });
       });
       if (Rivets.config.preloadData) {
       if (Rivets.config.preloadData) {
-        this.set(Rivets.config.adapter.read(this.context, this.keypath));
+        this.set(Rivets.config.adapter.read(this.model, this.keypath));
       }
       }
       if (_ref = this.type, __indexOf.call(bidirectionals, _ref) >= 0) {
       if (_ref = this.type, __indexOf.call(bidirectionals, _ref) >= 0) {
         return this.el.addEventListener('change', function(e) {
         return this.el.addEventListener('change', function(e) {
           var el;
           var el;
           el = e.target || e.srcElement;
           el = e.target || e.srcElement;
-          return Rivets.config.adapter.publish(_this.context, _this.keypath, getInputValue(el));
+          return Rivets.config.adapter.publish(_this.model, _this.keypath, getInputValue(el));
         });
         });
       }
       }
     };
     };
@@ -55,9 +55,9 @@
 
 
   Rivets.View = (function() {
   Rivets.View = (function() {
 
 
-    function View(el, contexts) {
+    function View(el, models) {
       this.el = el;
       this.el = el;
-      this.contexts = contexts;
+      this.models = models;
       this.bind = __bind(this.bind, this);
       this.bind = __bind(this.bind, this);
 
 
       this.build = __bind(this.build, this);
       this.build = __bind(this.build, this);
@@ -78,7 +78,7 @@
     };
     };
 
 
     View.prototype.build = function() {
     View.prototype.build = function() {
-      var attribute, context, keypath, node, path, pipes, type, _i, _len, _ref, _results;
+      var attribute, keypath, model, node, path, pipes, type, _i, _len, _ref, _results;
       this.bindings = [];
       this.bindings = [];
       _ref = this.el.getElementsByTagName('*');
       _ref = this.el.getElementsByTagName('*');
       _results = [];
       _results = [];
@@ -96,9 +96,9 @@
                 return pipe.trim();
                 return pipe.trim();
               });
               });
               path = pipes.shift().split('.');
               path = pipes.shift().split('.');
-              context = this.contexts[path.shift()];
+              model = this.models[path.shift()];
               keypath = path.join('.');
               keypath = path.join('.');
-              _results1.push(this.bindings.push(new Rivets.Binding(node, type, context, keypath, pipes)));
+              _results1.push(this.bindings.push(new Rivets.Binding(node, type, model, keypath, pipes)));
             } else {
             } else {
               _results1.push(void 0);
               _results1.push(void 0);
             }
             }
@@ -160,7 +160,7 @@
 
 
   bidirectionals = ['value', 'checked', 'unchecked', 'selected', 'unselected'];
   bidirectionals = ['value', 'checked', 'unchecked', 'selected', 'unselected'];
 
 
-  Rivets.bindings = {
+  Rivets.routines = {
     checked: stateBinding('checked'),
     checked: stateBinding('checked'),
     selected: stateBinding('selected'),
     selected: stateBinding('selected'),
     disabled: stateBinding('disabled'),
     disabled: stateBinding('disabled'),
@@ -201,15 +201,15 @@
       }
       }
       return _results;
       return _results;
     },
     },
-    register: function(routine, routineFunction) {
-      return Rivets.bindings[routine] = routineFunction;
+    register: function(identifier, routine) {
+      return Rivets.routines[identifier] = routine;
     },
     },
-    bind: function(el, contexts) {
+    bind: function(el, models) {
       var view;
       var view;
-      if (contexts == null) {
-        contexts = {};
+      if (models == null) {
+        models = {};
       }
       }
-      view = new Rivets.View(el, contexts);
+      view = new Rivets.View(el, models);
       view.bind();
       view.bind();
       return view;
       return view;
     }
     }

@@ -9,46 +9,46 @@ Rivets = {}
 # A single binding between a model attribute and a DOM element.
 # A single binding between a model attribute and a DOM element.
 class Rivets.Binding
 class Rivets.Binding
   # All information about the binding is passed into the constructor; the DOM
   # All information about the binding is passed into the constructor; the DOM
-  # element, the type of binding, the context object and the keypath at which to
-  # listen to for changes.
-  constructor: (@el, @type, @context, @keypath, @formatters = []) ->
-    @routine = Rivets.bindings[@type] || attributeBinding @type
+  # element, the routine identifier, the model object and the keypath at which
+  # to listen for changes.
+  constructor: (@el, @type, @model, @keypath, @formatters = []) ->
+    @routine = Rivets.routines[@type] || attributeBinding @type
 
 
-  # Sets a value for this binding. Basically just runs the routine on the
-  # element with a suplied value and applies any formatters.
+  # Sets the value for the binding. This Basically just runs the binding routine
+  # with the suplied value and applies any formatters.
   set: (value) =>
   set: (value) =>
     for formatter in @formatters
     for formatter in @formatters
       value = Rivets.config.formatters[formatter] value
       value = Rivets.config.formatters[formatter] value
 
 
     @routine @el, value
     @routine @el, value
 
 
-  # Subscribes to the context object for changes on the specific keypath.
-  # Conditionally also does the inverse and listens to the element for changes
-  # to propogate back to the context object.
+  # Subscribes to the model for changes at the specified keypath. Bi-directional
+  # routines will also listen for changes on the element to propagate them back
+  # to the model.
   bind: =>
   bind: =>
-    Rivets.config.adapter.subscribe @context, @keypath, (value) => @set value
+    Rivets.config.adapter.subscribe @model, @keypath, (value) => @set value
 
 
     if Rivets.config.preloadData
     if Rivets.config.preloadData
-      @set Rivets.config.adapter.read @context, @keypath
+      @set Rivets.config.adapter.read @model, @keypath
 
 
     if @type in bidirectionals
     if @type in bidirectionals
       @el.addEventListener 'change', (e) =>
       @el.addEventListener 'change', (e) =>
         el = e.target or e.srcElement
         el = e.target or e.srcElement
-        Rivets.config.adapter.publish @context, @keypath, getInputValue el
+        Rivets.config.adapter.publish @model, @keypath, getInputValue el
 
 
-# Parses and stores the binding data for an entire view binding.
+# A collection of bindings for a parent element.
 class Rivets.View
 class Rivets.View
-  # Takes the parent DOM element as well as all the context objects that are to
-  # be binded to the view.
-  constructor: (@el, @contexts) ->
+  # The parent DOM element and the model objects for binding are passed into the
+  # constructor.
+  constructor: (@el, @models) ->
     @build()
     @build()
 
 
-  # The regular expression used to match Rivets.js data binding attributes.
+  # Regular expression used to match binding attributes.
   bindingRegExp: =>
   bindingRegExp: =>
     prefix = Rivets.config.prefix
     prefix = Rivets.config.prefix
     if prefix then new RegExp("^data-#{prefix}-") else /^data-/
     if prefix then new RegExp("^data-#{prefix}-") else /^data-/
 
 
-  # Parses and builds new Rivets.Binding instances for the data bindings.
+  # Builds the Rivets.Binding instances for the view.
   build: =>
   build: =>
     @bindings = []
     @bindings = []
 
 
@@ -58,10 +58,10 @@ class Rivets.View
           type = attribute.name.replace @bindingRegExp(), ''
           type = attribute.name.replace @bindingRegExp(), ''
           pipes = attribute.value.split('|').map (pipe) -> pipe.trim()
           pipes = attribute.value.split('|').map (pipe) -> pipe.trim()
           path = pipes.shift().split '.'
           path = pipes.shift().split '.'
-          context = @contexts[path.shift()]
+          model = @models[path.shift()]
           keypath = path.join '.'
           keypath = path.join '.'
 
 
-          @bindings.push new Rivets.Binding node, type, context, keypath, pipes
+          @bindings.push new Rivets.Binding node, type, model, keypath, pipes
 
 
   # Binds all of the current bindings for this view.
   # Binds all of the current bindings for this view.
   bind: =>
   bind: =>
@@ -86,11 +86,11 @@ stateBinding = (attr, inverse = false) -> (el, value) ->
   binding el, if inverse is !value then attr else false
   binding el, if inverse is !value then attr else false
 
 
 # Bindings that should also be observed for changes on the DOM element in order
 # Bindings that should also be observed for changes on the DOM element in order
-# to propogate those changes back to the model object.
+# to propagate those changes back to the model object.
 bidirectionals = ['value', 'checked', 'unchecked', 'selected', 'unselected']
 bidirectionals = ['value', 'checked', 'unchecked', 'selected', 'unselected']
 
 
 # Core binding routines.
 # Core binding routines.
-Rivets.bindings =
+Rivets.routines =
   checked:
   checked:
     stateBinding 'checked'
     stateBinding 'checked'
   selected:
   selected:
@@ -120,20 +120,20 @@ Rivets.config =
 
 
 # The rivets module. This is the public interface that gets exported.
 # The rivets module. This is the public interface that gets exported.
 rivets =
 rivets =
-  # Used to set configuration options.
+  # Used for setting configuration options.
   configure: (options={}) ->
   configure: (options={}) ->
     for property, value of options
     for property, value of options
       Rivets.config[property] = value
       Rivets.config[property] = value
 
 
-  # Registers a new binding routine function that can be used immediately in the
-  # view. This is what is used to add custom data bindings.
-  register: (routine, routineFunction) ->
-    Rivets.bindings[routine] = routineFunction
+  # Registers a new binding routine that can be used immediately in views. This
+  # is used for adding custom binding routines.
+  register: (identifier, routine) ->
+    Rivets.routines[identifier] = routine
 
 
-  # Binds a set of context objects to the specified DOM element. Returns a new
-  # Rivets.View instance.
-  bind: (el, contexts = {}) ->
-    view = new Rivets.View(el, contexts)
+  # Binds a set of model objects to a parent DOM element. Returns a Rivets.View
+  # instance.
+  bind: (el, models = {}) ->
+    view = new Rivets.View(el, models)
     view.bind()
     view.bind()
     view
     view