diff --git a/CRM/Core/I18n/PseudoConstant.php b/CRM/Core/I18n/PseudoConstant.php
index ef5ea2be4f75889c0a21c59b6796351026965488..ee4074dc2406e3194bb9e4e0d503ad9fec0fd8cb 100644
--- a/CRM/Core/I18n/PseudoConstant.php
+++ b/CRM/Core/I18n/PseudoConstant.php
@@ -51,7 +51,7 @@ class CRM_Core_I18n_PseudoConstant {
       }
       // hand-crafted enforced overrides for language variants
       // NB: when adding support for a regional override for a new language below, update
-      // relevant comments in templates/CRM/common/civicrm.settings.php.tpl as well
+      // relevant comments in templates/CRM/common/civicrm.settings.php.template as well
       $longForShortMapping['zh'] = defined("CIVICRM_LANGUAGE_MAPPING_ZH") ? CIVICRM_LANGUAGE_MAPPING_ZH : 'zh_CN';
       $longForShortMapping['en'] = defined("CIVICRM_LANGUAGE_MAPPING_EN") ? CIVICRM_LANGUAGE_MAPPING_EN : 'en_US';
       $longForShortMapping['fr'] = defined("CIVICRM_LANGUAGE_MAPPING_FR") ? CIVICRM_LANGUAGE_MAPPING_FR : 'fr_FR';
diff --git a/install/civicrm.php b/install/civicrm.php
index 21ac16abd1c5fa00004f4e9d3bd2490ccdf979c7..e306c37f1fab70f19bece989f95d81a802984a47 100644
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@ -216,7 +216,7 @@ function civicrm_config(&$config) {
 
   $params['siteKey'] = md5(uniqid('', TRUE) . $params['baseURL']);
 
-  $str = file_get_contents($tplPath . 'civicrm.settings.php.tpl');
+  $str = file_get_contents($tplPath . 'civicrm.settings.php.template');
   foreach ($params as $key => $value) {
     $str = str_replace('%%' . $key . '%%', $value, $str);
   }
diff --git a/templates/CRM/common/civicrm.settings.php.tpl b/templates/CRM/common/civicrm.settings.php.template
similarity index 99%
rename from templates/CRM/common/civicrm.settings.php.tpl
rename to templates/CRM/common/civicrm.settings.php.template
index 94d394321bbf7b1f87c7117662053114dc2ec3f5..1d86303b5f21e28f9d33ed40766bc764c1e2bdca 100644
--- a/templates/CRM/common/civicrm.settings.php.tpl
+++ b/templates/CRM/common/civicrm.settings.php.template
@@ -26,7 +26,7 @@
 */
 
 /**
- * CiviCRM Configuration File
+ * CiviCRM Configuration File.
  */
 
 /**
diff --git a/tools/scripts/mk-drupal-test-site b/tools/scripts/mk-drupal-test-site
index 67be6b68822eed118fe38ff7d5e6297a27e30345..d5402670cf7f0fc4251c5291ec1550c6f1848601 100755
--- a/tools/scripts/mk-drupal-test-site
+++ b/tools/scripts/mk-drupal-test-site
@@ -112,7 +112,7 @@ done
 
 ln -s "$CIVI_ROOT" "sites/$SITE_URL/modules/civicrm"
 
-cat "$CIVI_ROOT/templates/CRM/common/civicrm.settings.php.tpl" \
+cat "$CIVI_ROOT/templates/CRM/common/civicrm.settings.php.template" \
   | sed "s;%%baseURL%%;http://${SITE_URL};" \
   | sed "s;%%cms%%;Drupal;" \
   | sed "s;%%CMSdbHost%%;${DB_HOST};" \