diff --git a/Gemfile_custom b/Gemfile_custom
index d48adb7d2..e853e54f6 100644
--- a/Gemfile_custom
+++ b/Gemfile_custom
@@ -2,9 +2,10 @@
 
 ###### Application monitoring services ######
 #
-# By default Consul supports the Errbit self-hosted error monitoring service,
-# through the Airbrake gem. That means Consul also supports using Airbrake as
-# an external service to monitor errors and application performance.
+# By default Consul Democracy supports the Errbit self-hosted error monitoring
+# service, through the Airbrake gem. That means Consul Democracy also supports
+# using Airbrake as an external service to monitor errors and application
+# performance.
 #
 # Here are some other services which can be used to monitor application errors
 # and performance.
diff --git a/app/assets/stylesheets/_consul_custom_overrides.scss b/app/assets/stylesheets/_consul_custom_overrides.scss
index ea1d5bea6..e399ea144 100644
--- a/app/assets/stylesheets/_consul_custom_overrides.scss
+++ b/app/assets/stylesheets/_consul_custom_overrides.scss
@@ -1,4 +1,4 @@
-// Override CONSUL and Foundation settings in this file.
+// Override CONSUL DEMOCRACY and Foundation settings in this file.
 //
 // For example, override the brand color to #123456 with:
 //
diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss
index e1c679e4d..150e9efdd 100644
--- a/app/assets/stylesheets/_consul_settings.scss
+++ b/app/assets/stylesheets/_consul_settings.scss
@@ -1,11 +1,11 @@
-//  CONSUL Settings
+//  CONSUL DEMOCRACY Settings
 //  -----------------------------
 //
 //  Table of Contents:
 //
 //  1. Foundation settings overrides
-//  2. CONSUL variables
-//  3. Foundation overrides depending on CONSUL variables
+//  2. CONSUL DEMOCRACY variables
+//  3. Foundation overrides depending on CONSUL DEMOCRACY variables
 //  4. Foundation fixes
 
 // 1. Foundation settings overrides
@@ -50,8 +50,8 @@ $orbit-caption-background: #eee;
 
 $show-header-for-stacked: true !default;
 
-// 2. CONSUL variables
-// --------------------
+// 2. CONSUL DEMOCRACY variables
+// -----------------------------
 
 $body-margin: calc(50vw - #{$global-width / 2}) !default;
 $full-width-margin: unquote("#{$global-width / 2} - 50vw") !default;
@@ -147,8 +147,8 @@ $sdg-colors: (
   17: #19486a
 ) !default;
 
-// 3. Foundation overrides depending on CONSUL variables
-// -----------------------------------------------------
+// 3. Foundation overrides depending on CONSUL DEMOCRACY variables
+// ---------------------------------------------------------------
 
 $anchor-color: $brand !default;
 $anchor-color-hover: darken($anchor-color, 20%) !default;
diff --git a/app/models/custom/setting.rb b/app/models/custom/setting.rb
index c67e1011d..d6c6dff6a 100644
--- a/app/models/custom/setting.rb
+++ b/app/models/custom/setting.rb
@@ -6,8 +6,8 @@ class Setting
 
     # Change this code when you'd like to add settings that aren't
     # already present in the database. These settings will be added when
-    # first installing CONSUL, when deploying code with Capistrano, or
-    # when manually executing the `settings:add_new_settings` task.
+    # first installing CONSUL DEMOCRACY, when deploying code with Capistrano,
+    # or when manually executing the `settings:add_new_settings` task.
     #
     # If a setting already exists in the database, changing its value in
     # this file will have no effect unless the task `rake db:seed` is
@@ -15,15 +15,15 @@ class Setting
     # so will overwrite the values of all existing settings in the
     # database, so use with care.
     #
-    # The tests in the spec/ folder rely on CONSUL's default settings, so
-    # it's recommended not to change the default settings in the test
-    # environment.
+    # The tests in the spec/ folder rely on CONSUL DEMOCRACY's default
+    # settings, so it's recommended not to change the default settings
+    # in the test environment.
     def defaults
       if Rails.env.test?
         consul_defaults
       else
         consul_defaults.merge({
-          # Overwrite default CONSUL settings or add new settings here
+          # Overwrite default CONSUL DEMOCRACY settings or add new settings here
         })
       end
     end
diff --git a/config/application.rb b/config/application.rb
index 5dd7f0744..9a1b081d3 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -31,7 +31,7 @@ module Consul
     config.action_view.form_with_generates_remote_forms = false
 
     # Keep using AES-256-CBC for message encryption in case it's used
-    # in any CONSUL installations
+    # in any CONSUL DEMOCRACY installations
     config.active_support.use_authenticated_message_encryption = false
 
     # Keep using the classic autoloader until we decide how custom classes
@@ -125,7 +125,7 @@ module Consul
     config.time_zone = "Madrid"
     config.active_job.queue_adapter = :delayed_job
 
-    # CONSUL specific custom overrides
+    # CONSUL DEMOCRACY specific custom overrides
     # Read more on documentation:
     # * English: https://github.com/consuldemocracy/consuldemocracy/blob/master/CUSTOMIZE_EN.md
     # * Spanish: https://github.com/consuldemocracy/consuldemocracy/blob/master/CUSTOMIZE_ES.md
diff --git a/spec/custom_spec_helper.rb b/spec/custom_spec_helper.rb
index b6ddad332..e5322b25a 100644
--- a/spec/custom_spec_helper.rb
+++ b/spec/custom_spec_helper.rb
@@ -1,9 +1,9 @@
 RSpec.configure do |config|
   # Add the :consul tag to tests which make sense in the original
-  # version of CONSUL but don't make sense in your application due to
-  # the custom changes you've implemented.
+  # version of CONSUL DEMOCRACY but don't make sense in your application
+  # due to the custom changes you've implemented.
   #
-  # Using this tag will help maintaining the test suite when doing
-  # custom changes and when upgrading to a newer version of CONSUL
+  # Using this tag will help maintaining the test suite when doing custom
+  # changes and when upgrading to a newer version of CONSUL DEMOCRACY
   config.filter_run_excluding consul: true
 end