diff --git a/include/account.h b/include/account.h
index 01ec082dd..777efb5d0 100644
--- a/include/account.h
+++ b/include/account.h
@@ -6,8 +6,8 @@
 class NickAlias;
 class NickCore;
 
-typedef unordered_map_namespace::unordered_map<Anope::string, NickAlias *, ci::hash, std::equal_to<ci::string> > nickalias_map;
-typedef unordered_map_namespace::unordered_map<Anope::string, NickCore *, ci::hash, std::equal_to<ci::string> > nickcore_map;
+typedef Anope::insensitive_map<NickAlias *> nickalias_map;
+typedef Anope::insensitive_map<NickCore *> nickcore_map;
 
 extern CoreExport nickalias_map NickAliasList;
 extern CoreExport nickcore_map NickCoreList;
diff --git a/include/channels.h b/include/channels.h
index 8d6cbde5e..d0f899794 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -9,7 +9,7 @@
 #ifndef CHANNELS_H
 #define CHANNELS_H
 
-typedef unordered_map_namespace::unordered_map<Anope::string, Channel *, ci::hash, std::equal_to<ci::string> > channel_map;
+typedef Anope::insensitive_map<Channel *> channel_map;
 extern CoreExport channel_map ChannelList;
 
 struct UserData
diff --git a/include/regchannel.h b/include/regchannel.h
index 5d366271a..6f9a52fdc 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -9,7 +9,7 @@
 #ifndef REGCHANNEL_H
 #define REGCHANNEL_H
 
-typedef unordered_map_namespace::unordered_map<Anope::string, ChannelInfo *, ci::hash, std::equal_to<ci::string> > registered_channel_map;
+typedef Anope::insensitive_map<ChannelInfo *> registered_channel_map;
 extern CoreExport registered_channel_map RegisteredChannelList;
 
 /** Flags used for the ChannelInfo class