diff --git a/PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Audio/PleaseWaitPrompt.Designer.cs
similarity index 100%
rename from PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.Designer.cs
rename to PCK-Studio/Forms/Additional-Popups/Audio/PleaseWaitPrompt.Designer.cs
diff --git a/PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.cs b/PCK-Studio/Forms/Additional-Popups/Audio/PleaseWaitPrompt.cs
similarity index 100%
rename from PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.cs
rename to PCK-Studio/Forms/Additional-Popups/Audio/PleaseWaitPrompt.cs
diff --git a/PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.resx b/PCK-Studio/Forms/Additional-Popups/Audio/PleaseWaitPrompt.resx
similarity index 100%
rename from PCK-Studio/Forms/Additional-Popups/Audio/pleaseWait.resx
rename to PCK-Studio/Forms/Additional-Popups/Audio/PleaseWaitPrompt.resx
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 2704e891..9559f6b0 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -296,29 +296,29 @@
     <Compile Include="Forms\Additional-Popups\Animation\SetBulkSpeed.Designer.cs">
       <DependentUpon>SetBulkSpeed.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\Additional-Popups\Audio\creditsEditor.cs">
+    <Compile Include="Forms\Additional-Popups\Audio\CreditsEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Additional-Popups\Audio\creditsEditor.Designer.cs">
-      <DependentUpon>creditsEditor.cs</DependentUpon>
+    <Compile Include="Forms\Additional-Popups\Audio\CreditsEditor.Designer.cs">
+      <DependentUpon>CreditsEditor.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\Additional-Popups\Audio\addCategory.cs">
+    <Compile Include="Forms\Additional-Popups\Audio\AddCategory.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Additional-Popups\Audio\addCategory.Designer.cs">
-      <DependentUpon>addCategory.cs</DependentUpon>
+    <Compile Include="Forms\Additional-Popups\Audio\AddCategory.Designer.cs">
+      <DependentUpon>AddCategory.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\Skins-And-Textures\addMeta.cs">
+    <Compile Include="Forms\Skins-And-Textures\AddMeta.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Skins-And-Textures\addMeta.Designer.cs">
-      <DependentUpon>addMeta.cs</DependentUpon>
+    <Compile Include="Forms\Skins-And-Textures\AddMeta.Designer.cs">
+      <DependentUpon>AddMeta.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\Skins-And-Textures\addNewSkin.cs">
+    <Compile Include="Forms\Skins-And-Textures\AddNewSkin.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Skins-And-Textures\addNewSkin.Designer.cs">
-      <DependentUpon>addNewSkin.cs</DependentUpon>
+    <Compile Include="Forms\Skins-And-Textures\AddNewSkin.Designer.cs">
+      <DependentUpon>AddNewSkin.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\Additional-Popups\AddPCKPassword.cs">
       <SubType>Form</SubType>
@@ -344,11 +344,11 @@
     <Compile Include="Forms\Additional-Popups\Grf\AddParameter.Designer.cs">
       <DependentUpon>AddParameter.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\Additional-Popups\Audio\pleaseWait.cs">
+    <Compile Include="Forms\Additional-Popups\Audio\PleaseWaitPrompt.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Additional-Popups\Audio\pleaseWait.Designer.cs">
-      <DependentUpon>pleaseWait.cs</DependentUpon>
+    <Compile Include="Forms\Additional-Popups\Audio\PleaseWaitPrompt.Designer.cs">
+      <DependentUpon>PleaseWaitPrompt.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\Utilities\AnimationUtil.cs" />
     <Compile Include="Forms\Utilities\Preferences.cs">
@@ -405,23 +405,23 @@
     <Compile Include="Forms\Editor\AudioEditor.Designer.cs">
       <DependentUpon>AudioEditor.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\Utilities\installPS3.cs">
+    <Compile Include="Forms\Utilities\InstallPS3.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Utilities\installPS3.Designer.cs">
-      <DependentUpon>installPS3.cs</DependentUpon>
+    <Compile Include="Forms\Utilities\InstallPS3.Designer.cs">
+      <DependentUpon>InstallPS3.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\Utilities\installVita.cs">
+    <Compile Include="Forms\Utilities\InstallVita.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Utilities\installVita.Designer.cs">
-      <DependentUpon>installVita.cs</DependentUpon>
+    <Compile Include="Forms\Utilities\InstallVita.Designer.cs">
+      <DependentUpon>InstallVita.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\Utilities\installWiiU.cs">
+    <Compile Include="Forms\Utilities\InstallWiiU.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Utilities\installWiiU.Designer.cs">
-      <DependentUpon>installWiiU.cs</DependentUpon>
+    <Compile Include="Forms\Utilities\InstallWiiU.Designer.cs">
+      <DependentUpon>InstallWiiU.cs</DependentUpon>
     </Compile>
     <Compile Include="Classes\Utils\ListUtils.cs" />
     <Compile Include="Forms\Utilities\PCK Manager.cs">
@@ -515,6 +515,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\Editor\LOCEditor.resx">
       <DependentUpon>LOCEditor.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\Additional-Popups\Animation\ChangeTile.resx">
       <DependentUpon>ChangeTile.cs</DependentUpon>
@@ -522,24 +523,24 @@
     <EmbeddedResource Include="Forms\Additional-Popups\Animation\SetBulkSpeed.resx">
       <DependentUpon>SetBulkSpeed.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Additional-Popups\Audio\creditsEditor.resx">
-      <DependentUpon>creditsEditor.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Additional-Popups\Audio\CreditsEditor.resx">
+      <DependentUpon>CreditsEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Additional-Popups\Audio\addCategory.resx">
-      <DependentUpon>addCategory.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Additional-Popups\Audio\AddCategory.resx">
+      <DependentUpon>AddCategory.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Skins-And-Textures\addMeta.ja.resx">
-      <DependentUpon>addMeta.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Skins-And-Textures\AddMeta.ja.resx">
+      <DependentUpon>AddMeta.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Skins-And-Textures\addMeta.resx">
-      <DependentUpon>addMeta.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Skins-And-Textures\AddMeta.resx">
+      <DependentUpon>AddMeta.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Skins-And-Textures\addNewSkin.ja.resx">
-      <DependentUpon>addNewSkin.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Skins-And-Textures\AddNewSkin.ja.resx">
+      <DependentUpon>AddNewSkin.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Skins-And-Textures\addNewSkin.resx">
-      <DependentUpon>addNewSkin.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Skins-And-Textures\AddNewSkin.resx">
+      <DependentUpon>AddNewSkin.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\Additional-Popups\AddPCKPassword.resx">
@@ -558,8 +559,8 @@
     <EmbeddedResource Include="Forms\Additional-Popups\Grf\AddParameter.resx">
       <DependentUpon>AddParameter.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Additional-Popups\Audio\pleaseWait.resx">
-      <DependentUpon>pleaseWait.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Additional-Popups\Audio\PleaseWaitPrompt.resx">
+      <DependentUpon>PleaseWaitPrompt.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\Utilities\Preferences.ja.resx">
       <DependentUpon>Preferences.cs</DependentUpon>
@@ -600,17 +601,17 @@
       <DependentUpon>AudioEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Utilities\installPS3.resx">
-      <DependentUpon>installPS3.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Utilities\InstallPS3.resx">
+      <DependentUpon>InstallPS3.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Utilities\installVita.resx">
-      <DependentUpon>installVita.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Utilities\InstallVita.resx">
+      <DependentUpon>InstallVita.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Utilities\installWiiU.ja.resx">
-      <DependentUpon>installWiiU.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Utilities\InstallWiiU.ja.resx">
+      <DependentUpon>InstallWiiU.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Utilities\installWiiU.resx">
-      <DependentUpon>installWiiU.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Utilities\InstallWiiU.resx">
+      <DependentUpon>InstallWiiU.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\Additional-Popups\MetaList.ja.resx">
       <DependentUpon>MetaList.cs</DependentUpon>