diff --git a/src/pages/test.jade b/src/pages/test.jade
index e1b1343a6..73f97a505 100644
--- a/src/pages/test.jade
+++ b/src/pages/test.jade
@@ -12,6 +12,7 @@ append styles
     style #mocha-stats { position: absolute; top: 9em; }
 
 block content
+
     #mocha
 
 append scripts
diff --git a/src/scripts/controllers/crafting_table_controller.coffee b/src/scripts/controllers/crafting_table_controller.coffee
index 92b7dbc9a..e880176cb 100644
--- a/src/scripts/controllers/crafting_table_controller.coffee
+++ b/src/scripts/controllers/crafting_table_controller.coffee
@@ -23,12 +23,13 @@ module.exports = class CraftingTableController extends BaseController
 
         @_parser = new InventoryParser
 
-        @model.catalog.on Event.change, => @onCatalogChanged()
+        @model.modPack.on Event.change, => @onModPackChanged()
 
     # Event Methods ################################################################################
 
-    onCatalogChanged: ->
+    onModPackChanged: ->
         return unless @rendered
+        @model.modPack.enableBooksForRecipe @$nameField.val()
         @_updateNameAutocomplete()
         @_craft()
 
@@ -49,8 +50,11 @@ module.exports = class CraftingTableController extends BaseController
         @model.name = @$nameField.val()
         @_craft()
 
+        # @$nameField.blur()
+
     onNameFieldFocused: ->
         return unless @rendered
+        @$nameField.val ""
         @$nameField.autocomplete 'search'
 
     onNameFieldKeyPress: (event)->
@@ -114,7 +118,7 @@ module.exports = class CraftingTableController extends BaseController
     # Private Methods ##############################################################################
 
     _craft: ->
-        if @model.catalog.hasRecipe @model.name
+        if @model.modPack.hasRecipe @model.name
             router.navigate "/item/#{encodeURIComponent(@model.name)}"
         else
             router.navigate "/item"
@@ -126,7 +130,7 @@ module.exports = class CraftingTableController extends BaseController
         onChanged = => @onNameFieldChanged()
 
         @$nameField.autocomplete
-            source:    @model.catalog.gatherNames()
+            source:    @model.modPack.gatherNames()
             delay:     0
             minLength: 0
             change:    onChanged
diff --git a/src/scripts/controllers/item_page_controller.coffee b/src/scripts/controllers/item_page_controller.coffee
index 3d97b19af..43ab5edbb 100644
--- a/src/scripts/controllers/item_page_controller.coffee
+++ b/src/scripts/controllers/item_page_controller.coffee
@@ -29,6 +29,6 @@ module.exports = class ItemPageController extends BaseController
     # BaseController Overrides #####################################################################
 
     onDidRender: ->
-        @catalogController = @addChild ModPackController, '.view__mod_pack', model:@model.catalog
+        @modPackController = @addChild ModPackController, '.view__mod_pack', model:@model.modPack
         @tableController = @addChild CraftingTableController, '.view__crafting_table', model:@model.table
         super
diff --git a/src/scripts/models/crafting_plan.coffee b/src/scripts/models/crafting_plan.coffee
index aecc97d06..43d7f8c11 100644
--- a/src/scripts/models/crafting_plan.coffee
+++ b/src/scripts/models/crafting_plan.coffee
@@ -11,8 +11,8 @@ Inventory = require './inventory'
 
 module.exports = class CraftingPlan
 
-    constructor: (@catalog, includingTools)->
-        if not @catalog then throw new Error 'catalog is required'
+    constructor: (@modPack, includingTools)->
+        if not @modPack then throw new Error 'modPack is required'
         @includingTools = if includingTools then true else false
         @clear()
 
@@ -51,9 +51,9 @@ module.exports = class CraftingPlan
         return unless targetItem?
         logger.debug "Processing targetItem: #{targetItem}"
 
-        return if @catalog.isRawMaterial targetItem.name
+        return if @modPack.isRawMaterial targetItem.name
 
-        recipes = @catalog.gatherRecipes targetItem.name
+        recipes = @modPack.gatherRecipes targetItem.name
         return if not recipes.length > 0
 
         recipe = recipes[0]
diff --git a/src/scripts/models/crafting_table.coffee b/src/scripts/models/crafting_table.coffee
index 4a9a0ef31..eb969ae5d 100644
--- a/src/scripts/models/crafting_table.coffee
+++ b/src/scripts/models/crafting_table.coffee
@@ -15,7 +15,7 @@ Inventory    = require './inventory'
 module.exports = class CraftingTable extends BaseModel
 
     constructor: (attributes={}, options={})->
-        if not attributes.catalog? then throw new Error "attributes.catalog is required"
+        if not attributes.modPack? then throw new Error "attributes.modPack is required"
         attributes.name           ?= null
         attributes.quantity       ?= 1
         attributes.includingTools ?= false
@@ -26,16 +26,16 @@ module.exports = class CraftingTable extends BaseModel
     # Public Methods ###############################################################################
 
     craft: ->
-        if not @catalog.hasRecipe @name
+        if not @modPack.hasRecipe @name
             @plan = null
             return
 
         toolPhrase = if @includingTools then ' includingTools' else ''
         logger.verbose "calculating build plan for #{@quantity} #{@name}#{toolPhrase} with inventory: #{@have}"
 
-        @catalog.enableBooksForRecipe @name
+        @modPack.enableBooksForRecipe @name
 
-        plan = new CraftingPlan @catalog, @includingTools
+        plan = new CraftingPlan @modPack, @includingTools
         plan.includingTools = @includingTools
         plan.craft @name, @quantity, @have
 
diff --git a/src/scripts/models/item_page.coffee b/src/scripts/models/item_page.coffee
index 12dd9caf6..07532cdb2 100644
--- a/src/scripts/models/item_page.coffee
+++ b/src/scripts/models/item_page.coffee
@@ -14,6 +14,6 @@ ModPack = require './mod_pack'
 module.exports = class ItemPage extends BaseModel
 
     constructor: (attributes={}, options={})->
-        attributes.catalog ?= new ModPack
-        attributes.table ?= new CraftingTable catalog:attributes.catalog
+        attributes.modPack ?= new ModPack
+        attributes.table ?= new CraftingTable modPack:attributes.modPack
         super attributes, options
diff --git a/src/templates/test.jade b/src/templates/test.jade
deleted file mode 100644
index ac2fdc2ca..000000000
--- a/src/templates/test.jade
+++ /dev/null
@@ -1,8 +0,0 @@
-//-
-//- Crafting Guide - test.jade
-//-
-//- Copyright (c) 2014 by Redwood Labs
-//- All rights reserved.
-//-
-
-p Hello world!