diff --git a/P3D/Content/Pokemon/Overworld/Normal/422e.png b/P3D/Content/Pokemon/Overworld/Normal/422_e.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Normal/422e.png
rename to P3D/Content/Pokemon/Overworld/Normal/422_e.png
diff --git a/P3D/Content/Pokemon/Overworld/Normal/422w.png b/P3D/Content/Pokemon/Overworld/Normal/422_w.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Normal/422w.png
rename to P3D/Content/Pokemon/Overworld/Normal/422_w.png
diff --git a/P3D/Content/Pokemon/Overworld/Normal/423e.png b/P3D/Content/Pokemon/Overworld/Normal/423_e.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Normal/423e.png
rename to P3D/Content/Pokemon/Overworld/Normal/423_e.png
diff --git a/P3D/Content/Pokemon/Overworld/Normal/423w.png b/P3D/Content/Pokemon/Overworld/Normal/423_w.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Normal/423w.png
rename to P3D/Content/Pokemon/Overworld/Normal/423_w.png
diff --git a/P3D/Content/Pokemon/Overworld/Shiny/422e.png b/P3D/Content/Pokemon/Overworld/Shiny/422_e.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Shiny/422e.png
rename to P3D/Content/Pokemon/Overworld/Shiny/422_e.png
diff --git a/P3D/Content/Pokemon/Overworld/Shiny/422w.png b/P3D/Content/Pokemon/Overworld/Shiny/422_w.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Shiny/422w.png
rename to P3D/Content/Pokemon/Overworld/Shiny/422_w.png
diff --git a/P3D/Content/Pokemon/Overworld/Shiny/423e.png b/P3D/Content/Pokemon/Overworld/Shiny/423_e.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Shiny/423e.png
rename to P3D/Content/Pokemon/Overworld/Shiny/423_e.png
diff --git a/P3D/Content/Pokemon/Overworld/Shiny/423w.png b/P3D/Content/Pokemon/Overworld/Shiny/423_w.png
similarity index 100%
rename from P3D/Content/Pokemon/Overworld/Shiny/423w.png
rename to P3D/Content/Pokemon/Overworld/Shiny/423_w.png
diff --git a/P3D/Content/Pokemon/Sprites/Gastrodone.png b/P3D/Content/Pokemon/Sprites/Gastrodon_e.png
similarity index 100%
rename from P3D/Content/Pokemon/Sprites/Gastrodone.png
rename to P3D/Content/Pokemon/Sprites/Gastrodon_e.png
diff --git a/P3D/Content/Pokemon/Sprites/Gastrodonw.png b/P3D/Content/Pokemon/Sprites/Gastrodon_w.png
similarity index 100%
rename from P3D/Content/Pokemon/Sprites/Gastrodonw.png
rename to P3D/Content/Pokemon/Sprites/Gastrodon_w.png
diff --git a/P3D/Content/Pokemon/Sprites/Shellose.png b/P3D/Content/Pokemon/Sprites/Shellos_e.png
similarity index 100%
rename from P3D/Content/Pokemon/Sprites/Shellose.png
rename to P3D/Content/Pokemon/Sprites/Shellos_e.png
diff --git a/P3D/Content/Pokemon/Sprites/Shellosw.png b/P3D/Content/Pokemon/Sprites/Shellos_w.png
similarity index 100%
rename from P3D/Content/Pokemon/Sprites/Shellosw.png
rename to P3D/Content/Pokemon/Sprites/Shellos_w.png
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 6a8b1c23d..678259720 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -13577,6 +13577,18 @@
     <Content Include="Content\Pokemon\Overworld\Normal\38_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Pokemon\Overworld\Normal\422_e.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Normal\422_w.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Normal\423_e.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Normal\423_w.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Overworld\Normal\50_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -13817,6 +13829,18 @@
     <Content Include="Content\Pokemon\Overworld\Shiny\38_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Pokemon\Overworld\Shiny\422_e.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Shiny\422_w.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Shiny\423_e.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Shiny\423_w.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\50_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -14064,6 +14088,12 @@
     <Content Include="Content\Pokemon\Sprites\Exeggutor_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Pokemon\Sprites\Gastrodon_e.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Sprites\Gastrodon_w.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Sprites\Geodude_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -14121,6 +14151,12 @@
     <Content Include="Content\Pokemon\Sprites\Sandslash_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Pokemon\Sprites\Shellos_e.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Sprites\Shellos_w.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Sprites\Vulpix_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -17526,18 +17562,6 @@
     <Content Include="Content\Pokemon\Overworld\Normal\422.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Overworld\Normal\422e.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Overworld\Normal\422w.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Overworld\Normal\423e.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Overworld\Normal\423w.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Pokemon\Overworld\Normal\424.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -20211,18 +20235,6 @@
     <Content Include="Content\Pokemon\Overworld\Shiny\422.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Overworld\Shiny\422e.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Overworld\Shiny\422w.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Overworld\Shiny\423e.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Overworld\Shiny\423w.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\424.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -22419,12 +22431,6 @@
     <Content Include="Content\Pokemon\Sprites\Gastly.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Sprites\Gastrodone.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Sprites\Gastrodonw.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Pokemon\Sprites\Genesect.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -23568,12 +23574,6 @@
     <Content Include="Content\Pokemon\Sprites\Shellder.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Sprites\Shellose.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Pokemon\Sprites\Shellosw.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Pokemon\Sprites\Shelmet.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/P3D/Pokemon/Monster/Resource/PokemonForms.vb b/P3D/Pokemon/Monster/Resource/PokemonForms.vb
index 2e0f4e916..2fa98f56e 100644
--- a/P3D/Pokemon/Monster/Resource/PokemonForms.vb
+++ b/P3D/Pokemon/Monster/Resource/PokemonForms.vb
@@ -2944,17 +2944,17 @@ Public Class PokemonForms
 
         Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
             If P.AdditionalData = "1" Then
-                Return P.OriginalName & "e"
+                Return P.OriginalName & "_e"
             Else
-                Return P.OriginalName & "w"
+                Return P.OriginalName & "_w"
             End If
         End Function
 
         Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
             If P.AdditionalData = "1" Then
-                Return "e"
+                Return "_e"
             Else
-                Return "w"
+                Return "_w"
             End If
         End Function
 
@@ -2987,17 +2987,17 @@ Public Class PokemonForms
 
         Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
             If P.AdditionalData = "1" Then
-                Return P.OriginalName & "e"
+                Return P.OriginalName & "_e"
             Else
-                Return P.OriginalName & "w"
+                Return P.OriginalName & "_w"
             End If
         End Function
 
         Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
             If P.AdditionalData = "1" Then
-                Return "e"
+                Return "_e"
             Else
-                Return "w"
+                Return "_w"
             End If
         End Function