diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73033219b395be59a3137eece00cc0ff114adb62..75085bf06e04d8e454c6570e5e3181bf8a0e9c58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ Python 3.5:
 Documentation:
   script:
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh
-  - "cp local_settings.py.example local_settings.py"
+  - "cp local_settings.example.py local_settings.py"
   - ". ./build-docs.sh"
   tags:
   - python3.5
@@ -27,7 +27,7 @@ Documentation:
 Mypy:
   script:
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-mypy.sh
-  - "cp local_settings.py.example local_settings.py"
+  - "cp local_settings.example.py local_settings.py"
   - ". ./prepare-and-run-mypy.sh"
   tags:
   - python3.5
diff --git a/doc/misc.rst b/doc/misc.rst
index 5730ac97ac8c261bbb4a5a0f18e4a196184b0a8f..e124ffda10a6ba977e0fea99b7fc7fbc49305b6d 100644
--- a/doc/misc.rst
+++ b/doc/misc.rst
@@ -27,7 +27,7 @@ the dependencies::
 
 Copy (and, optionally, edit) the example configuration::
 
-    cp local_settings.py.example local_settings.py
+    cp local_settings.example.py local_settings.py
     vi local_settings.py
 
 Initialize the database::
diff --git a/local_settings.py.example b/local_settings.example.py
similarity index 97%
rename from local_settings.py.example
rename to local_settings.example.py
index e171eb77c7cf2fe4be5f034add75868a3a10f3ac..e0e068d0729ef27ddfa072e4bb35e82c1c9d42fc 100644
--- a/local_settings.py.example
+++ b/local_settings.example.py
@@ -136,7 +136,7 @@ if RELATE_ENABLE_MULTIPLE_SMTP:
             'password': 'password',
             'port': 587,
             'use_tls': True,
-        }
+        },
 
         # For student to sending email to course staff.
         # Not implement yet
@@ -146,16 +146,16 @@ if RELATE_ENABLE_MULTIPLE_SMTP:
             'password': 'password',
             'port': 587,
             'use_tls': True,
-        }
+        },
     }
 
     # This will be used as default connection when other keys are not set.
     EMAIL_CONNECTION_DEFAULT = "robot"
 
-    NO_REPLY_EMAIL_FROM = "Example Noreply <noreply_example@example.com>"
-    NOTIFICATION_EMAIL_FROM = "Example Notification <notification_example@example.com>"
-    GRADER_FEEDBACK_EMAIL_FROM = "Example Feedback <feedback_example@example.com>"
-    STUDENT_INTERACT_EMAIL_FROM = "Example interaction <feedback_example@example.com>"
+    NO_REPLY_EMAIL_FROM = "Noreply <noreply_example@example.com>"
+    NOTIFICATION_EMAIL_FROM = "Notification <notification_example@example.com>"
+    GRADER_FEEDBACK_EMAIL_FROM = "Feedback <feedback_example@example.com>"
+    STUDENT_INTERACT_EMAIL_FROM = "interaction <feedback_example@example.com>"
 
 
 # }}}
diff --git a/run-tests-for-ci.sh b/run-tests-for-ci.sh
index 9c07597f34397bdcf0f858a44c2492884c1f54cd..898a0bbaf88131819ea2cdd4e852be2b1e089a03 100644
--- a/run-tests-for-ci.sh
+++ b/run-tests-for-ci.sh
@@ -65,7 +65,7 @@ fi
 
 $PIP install -r req.txt
 
-cp local_settings.py.example local_settings.py
+cp local_settings.example.py local_settings.py
 
 cd test
 python ../manage.py test