diff --git a/.ruby-gemset b/.ruby-gemset
index 193f1d15ab..709b99367b 100644
--- a/.ruby-gemset
+++ b/.ruby-gemset
@@ -1 +1 @@
-openfoodweb
+openfoodnetwork
diff --git a/README.markdown b/README.markdown
index dc7c009fe3..d172c02f8a 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,4 +1,4 @@
-# Open Food Web
+# Open Food Network
 
 Connect suppliers (ie. farmers), distributors (ie. co-ops) and
 consumers (ie. local food lovers) for the sale and purchase of local
@@ -21,11 +21,11 @@ hosted at GitHub.
 
 You can view the code at:
 
-    https://github.com/eaterprises/openfoodweb
+    https://github.com/eaterprises/openfoodnetwork
 
 You can download the source with the command:
 
-    git clone git@github.com:eaterprises/openfoodweb
+    git clone git@github.com:eaterprises/openfoodnetwork
 
 
 ## Get it running
@@ -46,7 +46,7 @@ Create the development and test databases, using the settings specified in `conf
 
 Load some default data for your environment
 
-    rake openfoodweb:dev:load_sample_data
+    rake openfoodnetwork:dev:load_sample_data
 
 At long last, your dreams of spinning up a development server can be realised:
 
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index f77c989432..721e495265 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Openfoodnetwork::Application.config.session_store :cookie_store, key: '_openfoodweb_session'
+Openfoodnetwork::Application.config.session_store :cookie_store, key: '_openfoodnetwork_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
diff --git a/db/migrate/20130814010857_remove_shipping_methods_using_itemwise_calculator.rb b/db/migrate/20130814010857_remove_shipping_methods_using_itemwise_calculator.rb
index e019ac3fe5..52351065dd 100644
--- a/db/migrate/20130814010857_remove_shipping_methods_using_itemwise_calculator.rb
+++ b/db/migrate/20130814010857_remove_shipping_methods_using_itemwise_calculator.rb
@@ -1,8 +1,8 @@
 class RemoveShippingMethodsUsingItemwiseCalculator < ActiveRecord::Migration
-  class OpenFoodWeb::Calculator::Itemwise < Spree::Calculator; end
+  class OpenFoodNetwork::Calculator::Itemwise < Spree::Calculator; end
 
   def up
-    Spree::ShippingMethod.all.select { |sm| sm.calculator.type == 'OpenFoodWeb::Calculator::Itemwise' }.each do |sm|
+    Spree::ShippingMethod.all.select { |sm| sm.calculator.type == 'OpenFoodNetwork::Calculator::Itemwise' }.each do |sm|
 
       say "Destroying itemwise shipping method with id #{sm.id}"
       sm.destroy
@@ -10,6 +10,6 @@ class RemoveShippingMethodsUsingItemwiseCalculator < ActiveRecord::Migration
   end
 
   def down
-    Spree::ShippingMethod.create!({name: 'Delivery', zone: Spree::Zone.last, calculator: OpenFoodWeb::Calculator::Itemwise.new}, without_protection: true)
+    Spree::ShippingMethod.create!({name: 'Delivery', zone: Spree::Zone.last, calculator: OpenFoodNetwork::Calculator::Itemwise.new}, without_protection: true)
   end
 end
diff --git a/lib/chili/local_organics_feature/app/overrides/spree/layouts/spree_application/footer.html.erb.deface b/lib/chili/local_organics_feature/app/overrides/spree/layouts/spree_application/footer.html.erb.deface
index e2c23552d0..d9b0ac9441 100644
--- a/lib/chili/local_organics_feature/app/overrides/spree/layouts/spree_application/footer.html.erb.deface
+++ b/lib/chili/local_organics_feature/app/overrides/spree/layouts/spree_application/footer.html.erb.deface
@@ -1,3 +1,3 @@
 <!-- insert_bottom '#footer-left p' -->
 | <%= link_to 'Terms and Conditions', "http://www.localorg.com.au/contactterms-and-conditions.html" %>
-| <%= link_to "http://openfoodweb.org/foundation" do %><%= image_tag 'ofw.png', alt: 'Open Food Web Foundation' %><% end %>
\ No newline at end of file
+| <%= link_to "http://openfoodweb.org/foundation" do %><%= image_tag 'ofw.png', alt: 'Open Food Foundation' %><% end %>
\ No newline at end of file
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 2a37b1a65b..8479b08ba5 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -1,5 +1,5 @@
 
-namespace :openfoodweb do
+namespace :openfoodnetwork do
 
   namespace :dev do
 
@@ -7,7 +7,7 @@ namespace :openfoodweb do
     task :load_sample_data => :environment do
       require File.expand_path('../../../spec/factories', __FILE__)
       require File.expand_path('../../../spec/support/spree/init', __FILE__)
-      task_name = "openfoodweb:dev:load_sample_data"
+      task_name = "openfoodnetwork:dev:load_sample_data"
 
       # -- Shipping / payment information
       unless Spree::Zone.find_by_name 'Australia'