diff --git a/db/pre-re/achievement_db.yml b/db/pre-re/achievement_db.yml
index d194364633..afa4a8c9bd 100644
--- a/db/pre-re/achievement_db.yml
+++ b/db/pre-re/achievement_db.yml
@@ -16,7 +16,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 ###########################################################################
-# Custom Achievement Database
+# Pre-Renewal Achievement Database
 ###########################################################################
 #
 # Achievement Settings
diff --git a/db/re/achievement_db.yml b/db/re/achievement_db.yml
index 4b9637ca61..4efa1eb337 100644
--- a/db/re/achievement_db.yml
+++ b/db/re/achievement_db.yml
@@ -16,7 +16,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 ###########################################################################
-# Custom Achievement Database
+# Renewal Achievement Database
 ###########################################################################
 #
 # Achievement Settings
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index e4fb32103f..7cdc07ae59 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -4752,8 +4752,8 @@ void do_init_npc(void){
 	npc_market_fromsql();
 #endif
 
-	timer_event_ers = ers_new(sizeof(struct timer_event_data),"npc.c::timer_event_ers",ERS_OPT_NONE);
-	npc_sc_display_ers = ers_new(sizeof(struct sc_display_entry), "npc.c:npc_sc_display_ers", ERS_OPT_NONE);
+	timer_event_ers = ers_new(sizeof(struct timer_event_data),"npc.cpp::timer_event_ers",ERS_OPT_NONE);
+	npc_sc_display_ers = ers_new(sizeof(struct sc_display_entry), "npc.cpp:npc_sc_display_ers", ERS_OPT_NONE);
 
 	// process all npc files
 	ShowStatus("Loading NPCs...\r");
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 304021848d..547c83a34d 100755
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -21585,8 +21585,8 @@ void do_init_skill(void)
 	skillunit_db = idb_alloc(DB_OPT_BASE);
 	skillusave_db = idb_alloc(DB_OPT_RELEASE_DATA);
 	bowling_db = idb_alloc(DB_OPT_BASE);
-	skill_unit_ers = ers_new(sizeof(struct skill_unit_group),"skill.c::skill_unit_ers",ERS_CACHE_OPTIONS);
-	skill_timer_ers  = ers_new(sizeof(struct skill_timerskill),"skill.c::skill_timer_ers",ERS_CACHE_OPTIONS);
+	skill_unit_ers = ers_new(sizeof(struct skill_unit_group),"skill.cpp::skill_unit_ers",ERS_CACHE_OPTIONS);
+	skill_timer_ers  = ers_new(sizeof(struct skill_timerskill),"skill.cpp::skill_timer_ers",ERS_CACHE_OPTIONS);
 
 	ers_chunk_size(skill_unit_ers, 150);
 	ers_chunk_size(skill_timer_ers, 150);
diff --git a/src/map/storage.cpp b/src/map/storage.cpp
index 3f4ab60b1f..c9ec7e654b 100644
--- a/src/map/storage.cpp
+++ b/src/map/storage.cpp
@@ -98,7 +98,7 @@ void storage_sortitem(struct item* items, unsigned int size)
 
 /**
  * Initiate storage module
- * Called from map.c::do_init()
+ * Called from map.cpp::do_init()
  */
 void do_init_storage(void)
 {
@@ -110,7 +110,7 @@ void do_init_storage(void)
 /**
  * Destroy storage module
  * @author : [MC Cameri]
- * Called from map.c::do_final()
+ * Called from map.cpp::do_final()
  */
 void do_final_storage(void)
 {