diff --git a/Gemfile b/Gemfile
index 89a3cfd..77ec491 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,10 +21,10 @@ group :assets do
   gem 'momentjs-rails'
 end
 
-gem 'simply_stored' , github: 'bterkuile/simply_stored', branch: 'master'
+gem 'simply_couch' , github: 'bterkuile/simply_couch', branch: 'master'
 #gem 'orm_adapter', github: 'bterkuile/orm_adapter'
 gem 'devise'
-gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored', branch: 'master'
+gem 'devise_simply_couch', github: 'bterkuile/devise_simply_couch', branch: 'master'
 gem 'slim-rails'
 gem 'paperclip', ['>= 3.4', '!= 4.3.0']
 gem 'email_validator'
diff --git a/README.md b/README.md
index 0ee89be..65126b8 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ To start using Cmtool as website CMS add it to your Gemfile. Since it  depends
 on github gems and gem dependencies do not support those you have to
 explicitly add two dependencies to your Gemfile:
     gem 'couch_potato' , github: 'bterkuile/couch_potato'
-    gem 'simply_stored' , github: 'bterkuile/simply_stored'
+    gem 'simply_couch' , github: 'bterkuile/simply_couch'
     gem 'cmtool'
 
 Make sure that the locales you want to work with are specified in
@@ -94,7 +94,7 @@ end
 ```
 
 This is enough to start using Cmtool. But probably you want to add some
-goodies of your own. Remember that this is a SimplyStored model with almost
+goodies of your own. Remember that this is a SimplyCouch model with almost
 all the ActiveModel features.
 
 ### Page model
diff --git a/app/helpers/cmtool/application_helper.rb b/app/helpers/cmtool/application_helper.rb
index 8368933..a7fdee5 100644
--- a/app/helpers/cmtool/application_helper.rb
+++ b/app/helpers/cmtool/application_helper.rb
@@ -135,7 +135,7 @@ module Cmtool
     def edit_td(obj, options = {})
       path = options[:path] || case obj
         when Array then edit_polymorphic_path(obj)
-        when SimplyStored::Couch then edit_polymorphic_path([options[:scope] || cmtool, obj])
+        when SimplyCouch::Model then edit_polymorphic_path([options[:scope] || cmtool, obj])
         else obj
       end
       content_tag(
@@ -148,7 +148,7 @@ module Cmtool
     def destroy_td(obj, options = {})
       path = options[:path] || case obj
         when Array then polymorphic_path(obj)
-        when SimplyStored::Couch then polymorphic_path([options[:scope] || cmtool, obj])
+        when SimplyCouch::Model then polymorphic_path([options[:scope] || cmtool, obj])
         else obj
       end
 
diff --git a/app/models/cmtool/contact_form.rb b/app/models/cmtool/contact_form.rb
index de9ea84..8e5b91f 100644
--- a/app/models/cmtool/contact_form.rb
+++ b/app/models/cmtool/contact_form.rb
@@ -1,6 +1,6 @@
 module Cmtool
   class ContactForm
-    include SimplyStored::Couch
+    include SimplyCouch::Model
     property :gender
     property :name
     property :email
diff --git a/app/models/cmtool/directory.rb b/app/models/cmtool/directory.rb
index fd28370..8b2d790 100644
--- a/app/models/cmtool/directory.rb
+++ b/app/models/cmtool/directory.rb
@@ -1,6 +1,6 @@
 module Cmtool
   class Directory
-    include SimplyStored::Couch
+    include SimplyCouch::Model
 
     property :name
 
diff --git a/app/models/cmtool/faq.rb b/app/models/cmtool/faq.rb
index 7fd4a1a..222f1ce 100644
--- a/app/models/cmtool/faq.rb
+++ b/app/models/cmtool/faq.rb
@@ -1,6 +1,6 @@
 module Cmtool
   class Faq
-    include SimplyStored::Couch
+    include SimplyCouch::Model
 
     property :question
     property :answer
diff --git a/app/models/cmtool/image.rb b/app/models/cmtool/image.rb
index 1a8de69..b60db48 100644
--- a/app/models/cmtool/image.rb
+++ b/app/models/cmtool/image.rb
@@ -1,9 +1,9 @@
 module Cmtool
   class Image
-    include SimplyStored::Couch
+    include SimplyCouch::Model
     include Paperclip::Glue
-    # TODO: Replace Paperclip with SimplyStored::HasAttachment
-    # 1. Change `include Paperclip::Glue` to `include SimplyStored::HasAttachment`
+    # TODO: Replace Paperclip with SimplyCouch::HasAttachment
+    # 1. Change `include Paperclip::Glue` to `include SimplyCouch::HasAttachment`
     # 2. Replace `has_attached_file :file, styles: {...}` with `has_attachment :file, styles: {...}`
     # 3. Replace `validates_attachment` with standard Rails validations
 
diff --git a/app/models/cmtool/keyword.rb b/app/models/cmtool/keyword.rb
index 01baa3c..e321e22 100644
--- a/app/models/cmtool/keyword.rb
+++ b/app/models/cmtool/keyword.rb
@@ -1,6 +1,6 @@
 module Cmtool
   class Keyword
-    include SimplyStored::Couch
+    include SimplyCouch::Model
 
     property :name
 
diff --git a/app/models/cmtool/news.rb b/app/models/cmtool/news.rb
index 2a94160..c1133e1 100644
--- a/app/models/cmtool/news.rb
+++ b/app/models/cmtool/news.rb
@@ -1,9 +1,9 @@
 module Cmtool
   class News
-    include SimplyStored::Couch
+    include SimplyCouch::Model
     include Paperclip::Glue
-    # TODO: Replace Paperclip with SimplyStored::HasAttachment
-    # 1. Change `include Paperclip::Glue` to `include SimplyStored::HasAttachment`
+    # TODO: Replace Paperclip with SimplyCouch::HasAttachment
+    # 1. Change `include Paperclip::Glue` to `include SimplyCouch::HasAttachment`
     # 2. Replace `has_attached_file :image, styles: {...}` with `has_attachment :image, styles: {...}`
 
     property :title
diff --git a/app/models/cmtool/newsletter_subscription.rb b/app/models/cmtool/newsletter_subscription.rb
index d5403e9..c44b7b8 100644
--- a/app/models/cmtool/newsletter_subscription.rb
+++ b/app/models/cmtool/newsletter_subscription.rb
@@ -1,6 +1,6 @@
 module Cmtool
   class NewsletterSubscription
-    include SimplyStored::Couch
+    include SimplyCouch::Model
 
     # PROPERTIES
     property :email
diff --git a/app/models/cmtool/quote.rb b/app/models/cmtool/quote.rb
index 2523b88..5db2c08 100644
--- a/app/models/cmtool/quote.rb
+++ b/app/models/cmtool/quote.rb
@@ -1,9 +1,9 @@
 module Cmtool
   class Quote
-    include SimplyStored::Couch
+    include SimplyCouch::Model
     include Paperclip::Glue
-    # TODO: Replace Paperclip with SimplyStored::HasAttachment
-    # 1. Change `include Paperclip::Glue` to `include SimplyStored::HasAttachment`
+    # TODO: Replace Paperclip with SimplyCouch::HasAttachment
+    # 1. Change `include Paperclip::Glue` to `include SimplyCouch::HasAttachment`
     # 2. Replace `has_attached_file :image, styles: {...}` with `has_attachment :image, styles: {...}`
 
     property :owner
diff --git a/app/models/cmtool/yml_file.rb b/app/models/cmtool/yml_file.rb
index 2662420..292b452 100644
--- a/app/models/cmtool/yml_file.rb
+++ b/app/models/cmtool/yml_file.rb
@@ -1,6 +1,6 @@
 module Cmtool
   class YmlFile
-    include SimplyStored::Couch
+    include SimplyCouch::Model
 
     property :name
     property :body
diff --git a/lib/cmtool.rb b/lib/cmtool.rb
index fac86ae..9e70c9e 100644
--- a/lib/cmtool.rb
+++ b/lib/cmtool.rb
@@ -10,8 +10,8 @@ require 'email_validator'
 # Paperclip replacement — stores file metadata as CouchDB properties,
 # handles thumbnail generation via MiniMagick.
 # Replace `include Paperclip::Glue` + `has_attached_file` with
-# `include SimplyStored::HasAttachment` + `has_attachment`
-# has_attachment now in simply_stored gem
+# `include SimplyCouch::HasAttachment` + `has_attachment`
+# has_attachment now in simply_couch gem
 
 module Cmtool
 end
diff --git a/lib/cmtool/engine.rb b/lib/cmtool/engine.rb
index 8b2ff3c..df04205 100644
--- a/lib/cmtool/engine.rb
+++ b/lib/cmtool/engine.rb
@@ -1,9 +1,8 @@
 =begin
-require 'couch_potato'
-require 'simply_stored'
+require 'simply_couch'
 require 'email_validator'
 require 'devise'
-require 'devise_simply_stored'
+require 'devise_simply_couch'
 require 'sass-rails'
 require 'paperclip'
 require 'jquery-rails'
@@ -19,7 +18,7 @@ module Cmtool
     #   require 'slim-rails'
     #   require 'paperclip'
     #   require 'devise'
-    #   require 'devise_simply_stored'
+    #   require 'devise_simply_couch'
     #   require 'jquery-rails'
     #   # require 'tinymce-rails'
     #
diff --git a/lib/cmtool/includes/page.rb b/lib/cmtool/includes/page.rb
index fc71352..0317aab 100644
--- a/lib/cmtool/includes/page.rb
+++ b/lib/cmtool/includes/page.rb
@@ -2,7 +2,7 @@ module Cmtool
   module Includes
     module Page
       def self.included(klass)
-        klass.send :include, SimplyStored::Couch
+        klass.send :include, SimplyCouch::Model
         klass.send :include, InstanceMethods
         klass.send :extend, ClassMethods
 
diff --git a/lib/cmtool/includes/user.rb b/lib/cmtool/includes/user.rb
index 03f06b9..75fa790 100644
--- a/lib/cmtool/includes/user.rb
+++ b/lib/cmtool/includes/user.rb
@@ -2,8 +2,8 @@ module Cmtool
   module Includes
     module User
       def self.included(klass)
-        klass.send :include, SimplyStored::Couch
-        #klass.send :include, Devise::Orm::SimplyStored
+        klass.send :include, SimplyCouch::Model
+        #klass.send :include, Devise::Orm::SimplyCouch
         klass.send :include, InstanceMethods
         klass.send :extend, ClassMethods
 
diff --git a/spec/dummy/config/initializers/devise.rb b/spec/dummy/config/initializers/devise.rb
index e878da2..e5e51b1 100644
--- a/spec/dummy/config/initializers/devise.rb
+++ b/spec/dummy/config/initializers/devise.rb
@@ -19,8 +19,8 @@ Devise.setup do |config|
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
   # available as additional gems.
-  #require 'devise/orm/simply_stored'
-  require 'orm_adapter/adapters/simply_stored'
+  #require 'devise/orm/simply_couch'
+  require 'orm_adapter/adapters/simply_couch'
 
   # ==> Configuration for any authentication mechanism
   # Configure which keys are used when authenticating a user. The default is