diff --git a/rails/pennmaps/.gitignore b/rails/map-mash/.gitignore
similarity index 100%
rename from rails/pennmaps/.gitignore
rename to rails/map-mash/.gitignore
diff --git a/rails/pennmaps/Gemfile b/rails/map-mash/Gemfile
similarity index 100%
rename from rails/pennmaps/Gemfile
rename to rails/map-mash/Gemfile
diff --git a/rails/pennmaps/Gemfile.lock b/rails/map-mash/Gemfile.lock
similarity index 100%
rename from rails/pennmaps/Gemfile.lock
rename to rails/map-mash/Gemfile.lock
diff --git a/rails/pennmaps/README b/rails/map-mash/README
similarity index 100%
rename from rails/pennmaps/README
rename to rails/map-mash/README
diff --git a/rails/pennmaps/Rakefile b/rails/map-mash/Rakefile
similarity index 100%
rename from rails/pennmaps/Rakefile
rename to rails/map-mash/Rakefile
diff --git a/rails/pennmaps/app/controllers/application_controller.rb b/rails/map-mash/app/controllers/application_controller.rb
similarity index 100%
rename from rails/pennmaps/app/controllers/application_controller.rb
rename to rails/map-mash/app/controllers/application_controller.rb
diff --git a/rails/pennmaps/app/helpers/application_helper.rb b/rails/map-mash/app/helpers/application_helper.rb
similarity index 100%
rename from rails/pennmaps/app/helpers/application_helper.rb
rename to rails/map-mash/app/helpers/application_helper.rb
diff --git a/rails/pennmaps/config/boot.rb b/rails/map-mash/config/boot.rb
similarity index 100%
rename from rails/pennmaps/config/boot.rb
rename to rails/map-mash/config/boot.rb
diff --git a/rails/pennmaps/config/database.yml b/rails/map-mash/config/database.yml
similarity index 100%
rename from rails/pennmaps/config/database.yml
rename to rails/map-mash/config/database.yml
diff --git a/rails/pennmaps/config/environment.rb b/rails/map-mash/config/environment.rb
similarity index 100%
rename from rails/pennmaps/config/environment.rb
rename to rails/map-mash/config/environment.rb
diff --git a/rails/pennmaps/config/environments/development.rb b/rails/map-mash/config/environments/development.rb
similarity index 100%
rename from rails/pennmaps/config/environments/development.rb
rename to rails/map-mash/config/environments/development.rb
diff --git a/rails/pennmaps/config/environments/production.rb b/rails/map-mash/config/environments/production.rb
similarity index 100%
rename from rails/pennmaps/config/environments/production.rb
rename to rails/map-mash/config/environments/production.rb
diff --git a/rails/pennmaps/config/environments/test.rb b/rails/map-mash/config/environments/test.rb
similarity index 100%
rename from rails/pennmaps/config/environments/test.rb
rename to rails/map-mash/config/environments/test.rb
diff --git a/rails/pennmaps/config/initializers/backtrace_silencers.rb b/rails/map-mash/config/initializers/backtrace_silencers.rb
similarity index 100%
rename from rails/pennmaps/config/initializers/backtrace_silencers.rb
rename to rails/map-mash/config/initializers/backtrace_silencers.rb
diff --git a/rails/pennmaps/config/initializers/inflections.rb b/rails/map-mash/config/initializers/inflections.rb
similarity index 100%
rename from rails/pennmaps/config/initializers/inflections.rb
rename to rails/map-mash/config/initializers/inflections.rb
diff --git a/rails/pennmaps/config/initializers/mime_types.rb b/rails/map-mash/config/initializers/mime_types.rb
similarity index 100%
rename from rails/pennmaps/config/initializers/mime_types.rb
rename to rails/map-mash/config/initializers/mime_types.rb
diff --git a/rails/pennmaps/config/initializers/new_rails_defaults.rb b/rails/map-mash/config/initializers/new_rails_defaults.rb
similarity index 100%
rename from rails/pennmaps/config/initializers/new_rails_defaults.rb
rename to rails/map-mash/config/initializers/new_rails_defaults.rb
diff --git a/rails/pennmaps/config/initializers/session_store.rb b/rails/map-mash/config/initializers/session_store.rb
similarity index 95%
rename from rails/pennmaps/config/initializers/session_store.rb
rename to rails/map-mash/config/initializers/session_store.rb
index 92a74ac..0c9a2d3 100644
--- a/rails/pennmaps/config/initializers/session_store.rb
+++ b/rails/map-mash/config/initializers/session_store.rb
@@ -5,7 +5,7 @@
 # Make sure the secret is at least 30 characters and all random, 
 # no regular words or you'll be exposed to dictionary attacks.
 ActionController::Base.session = {
-  :key         => '_pennmaps_session',
+  :key         => '_map_mash_session',
   :secret      => '28f75daa5d26dcf4393a379bca87589d42118d8796f9c32fd5a183e879765c0ba458f1e9803caf5f183ed68d1a107de6f06871353a49bc1e29a758f7ada4c324'
 }
 
diff --git a/rails/pennmaps/config/locales/en.yml b/rails/map-mash/config/locales/en.yml
similarity index 100%
rename from rails/pennmaps/config/locales/en.yml
rename to rails/map-mash/config/locales/en.yml
diff --git a/rails/pennmaps/config/routes.rb b/rails/map-mash/config/routes.rb
similarity index 100%
rename from rails/pennmaps/config/routes.rb
rename to rails/map-mash/config/routes.rb
diff --git a/rails/pennmaps/db/schema.rb b/rails/map-mash/db/schema.rb
similarity index 100%
rename from rails/pennmaps/db/schema.rb
rename to rails/map-mash/db/schema.rb
diff --git a/rails/pennmaps/doc/README_FOR_APP b/rails/map-mash/doc/README_FOR_APP
similarity index 100%
rename from rails/pennmaps/doc/README_FOR_APP
rename to rails/map-mash/doc/README_FOR_APP
diff --git a/rails/pennmaps/public/404.html b/rails/map-mash/public/404.html
similarity index 100%
rename from rails/pennmaps/public/404.html
rename to rails/map-mash/public/404.html
diff --git a/rails/pennmaps/public/422.html b/rails/map-mash/public/422.html
similarity index 100%
rename from rails/pennmaps/public/422.html
rename to rails/map-mash/public/422.html
diff --git a/rails/pennmaps/public/500.html b/rails/map-mash/public/500.html
similarity index 100%
rename from rails/pennmaps/public/500.html
rename to rails/map-mash/public/500.html
diff --git a/rails/pennmaps/public/favicon.ico b/rails/map-mash/public/favicon.ico
similarity index 100%
rename from rails/pennmaps/public/favicon.ico
rename to rails/map-mash/public/favicon.ico
diff --git a/rails/pennmaps/public/images/rails.png b/rails/map-mash/public/images/rails.png
similarity index 100%
rename from rails/pennmaps/public/images/rails.png
rename to rails/map-mash/public/images/rails.png
diff --git a/rails/pennmaps/public/index.html b/rails/map-mash/public/index.html
similarity index 100%
rename from rails/pennmaps/public/index.html
rename to rails/map-mash/public/index.html
diff --git a/rails/pennmaps/public/javascripts/application.js b/rails/map-mash/public/javascripts/application.js
similarity index 100%
rename from rails/pennmaps/public/javascripts/application.js
rename to rails/map-mash/public/javascripts/application.js
diff --git a/rails/pennmaps/public/javascripts/controls.js b/rails/map-mash/public/javascripts/controls.js
similarity index 100%
rename from rails/pennmaps/public/javascripts/controls.js
rename to rails/map-mash/public/javascripts/controls.js
diff --git a/rails/pennmaps/public/javascripts/dragdrop.js b/rails/map-mash/public/javascripts/dragdrop.js
similarity index 100%
rename from rails/pennmaps/public/javascripts/dragdrop.js
rename to rails/map-mash/public/javascripts/dragdrop.js
diff --git a/rails/pennmaps/public/javascripts/effects.js b/rails/map-mash/public/javascripts/effects.js
similarity index 100%
rename from rails/pennmaps/public/javascripts/effects.js
rename to rails/map-mash/public/javascripts/effects.js
diff --git a/rails/pennmaps/public/javascripts/prototype.js b/rails/map-mash/public/javascripts/prototype.js
similarity index 100%
rename from rails/pennmaps/public/javascripts/prototype.js
rename to rails/map-mash/public/javascripts/prototype.js
diff --git a/rails/pennmaps/public/robots.txt b/rails/map-mash/public/robots.txt
similarity index 100%
rename from rails/pennmaps/public/robots.txt
rename to rails/map-mash/public/robots.txt
diff --git a/rails/pennmaps/script/about b/rails/map-mash/script/about
similarity index 100%
rename from rails/pennmaps/script/about
rename to rails/map-mash/script/about
diff --git a/rails/pennmaps/script/console b/rails/map-mash/script/console
similarity index 100%
rename from rails/pennmaps/script/console
rename to rails/map-mash/script/console
diff --git a/rails/pennmaps/script/dbconsole b/rails/map-mash/script/dbconsole
similarity index 100%
rename from rails/pennmaps/script/dbconsole
rename to rails/map-mash/script/dbconsole
diff --git a/rails/pennmaps/script/destroy b/rails/map-mash/script/destroy
similarity index 100%
rename from rails/pennmaps/script/destroy
rename to rails/map-mash/script/destroy
diff --git a/rails/pennmaps/script/generate b/rails/map-mash/script/generate
similarity index 100%
rename from rails/pennmaps/script/generate
rename to rails/map-mash/script/generate
diff --git a/rails/pennmaps/script/performance/benchmarker b/rails/map-mash/script/performance/benchmarker
similarity index 100%
rename from rails/pennmaps/script/performance/benchmarker
rename to rails/map-mash/script/performance/benchmarker
diff --git a/rails/pennmaps/script/performance/profiler b/rails/map-mash/script/performance/profiler
similarity index 100%
rename from rails/pennmaps/script/performance/profiler
rename to rails/map-mash/script/performance/profiler
diff --git a/rails/pennmaps/script/plugin b/rails/map-mash/script/plugin
similarity index 100%
rename from rails/pennmaps/script/plugin
rename to rails/map-mash/script/plugin
diff --git a/rails/pennmaps/script/runner b/rails/map-mash/script/runner
similarity index 100%
rename from rails/pennmaps/script/runner
rename to rails/map-mash/script/runner
diff --git a/rails/pennmaps/script/server b/rails/map-mash/script/server
similarity index 100%
rename from rails/pennmaps/script/server
rename to rails/map-mash/script/server
diff --git a/rails/pennmaps/test/performance/browsing_test.rb b/rails/map-mash/test/performance/browsing_test.rb
similarity index 100%
rename from rails/pennmaps/test/performance/browsing_test.rb
rename to rails/map-mash/test/performance/browsing_test.rb
diff --git a/rails/pennmaps/test/test_helper.rb b/rails/map-mash/test/test_helper.rb
similarity index 100%
rename from rails/pennmaps/test/test_helper.rb
rename to rails/map-mash/test/test_helper.rb