diff --git a/src/main/java/com/prupe/mcpatcher/MCLogger.java b/src/main/java/com/prupe/mcpatcher/MCLogger.java
index 5b3cdf0..4621fa1 100644
--- a/src/main/java/com/prupe/mcpatcher/MCLogger.java
+++ b/src/main/java/com/prupe/mcpatcher/MCLogger.java
@@ -1,6 +1,7 @@
 package com.prupe.mcpatcher;
 
 import java.util.HashMap;
+import java.util.Map;
 import java.util.logging.Formatter;
 import java.util.logging.Handler;
 import java.util.logging.Level;
@@ -9,7 +10,7 @@
 
 public class MCLogger {
 
-    private static final HashMap<String, MCLogger> allLoggers = new HashMap<>();
+    private static final Map<String, MCLogger> allLoggers = new HashMap<>();
 
     public static final Level ERROR = new ErrorLevel();
 
diff --git a/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java b/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java
index 368493c..d62c174 100644
--- a/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java
+++ b/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java
@@ -2,6 +2,7 @@
 
 import java.awt.image.BufferedImage;
 import java.util.HashMap;
+import java.util.Map;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.EntityRenderer;
@@ -25,7 +26,7 @@ public final class Lightmap {
 
     private static final boolean useLightmaps = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "lightmaps", true);
 
-    private static final HashMap<Integer, Lightmap> lightmaps = new HashMap<>();
+    private static final Map<Integer, Lightmap> lightmaps = new HashMap<>();
 
     private final int width;
     private final boolean customNightvision;
diff --git a/src/main/java/com/prupe/mcpatcher/mob/MobRandomizer.java b/src/main/java/com/prupe/mcpatcher/mob/MobRandomizer.java
index d35d432..ff52803 100644
--- a/src/main/java/com/prupe/mcpatcher/mob/MobRandomizer.java
+++ b/src/main/java/com/prupe/mcpatcher/mob/MobRandomizer.java
@@ -6,6 +6,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -20,7 +21,7 @@
 public class MobRandomizer {
 
     private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.RANDOM_MOBS);
-    private static final LinkedHashMap<String, ResourceLocation> cache = new LinkedHashMap<>();
+    private static final Map<String, ResourceLocation> cache = new LinkedHashMap<>();
 
     static {
         TexturePackChangeHandler.register(new TexturePackChangeHandler(MCPatcherUtils.RANDOM_MOBS, 2) {
@@ -85,8 +86,8 @@ public static final class ExtraInfo {
         private static final long ADDEND = 0xbL;
         private static final long MASK = (1L << 48) - 1;
 
-        private static final HashMap<Integer, ExtraInfo> allInfo = new HashMap<>();
-        private static final HashMap<WeakReference<EntityLivingBase>, ExtraInfo> allRefs = new HashMap<>();
+        private static final Map<Integer, ExtraInfo> allInfo = new HashMap<>();
+        private static final Map<WeakReference<EntityLivingBase>, ExtraInfo> allRefs = new HashMap<>();
         private static final ReferenceQueue<EntityLivingBase> refQueue = new ReferenceQueue<>();
 
         private final int entityId;
diff --git a/src/main/java/com/prupe/mcpatcher/sky/SkyRenderer.java b/src/main/java/com/prupe/mcpatcher/sky/SkyRenderer.java
index 5e67d5c..f1bb668 100644
--- a/src/main/java/com/prupe/mcpatcher/sky/SkyRenderer.java
+++ b/src/main/java/com/prupe/mcpatcher/sky/SkyRenderer.java
@@ -36,7 +36,7 @@ public class SkyRenderer {
     private static float celestialAngle;
     private static float rainStrength;
 
-    private static final HashMap<Integer, WorldEntry> worldSkies = new HashMap<>();
+    private static final Map<Integer, WorldEntry> worldSkies = new HashMap<>();
     private static WorldEntry currentWorld;
 
     public static boolean active;