diff --git a/PCK-Studio/Forms/Additional-Popups/Behaviours/AddBehaviour.Designer.cs b/PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.Designer.cs
similarity index 98%
rename from PCK-Studio/Forms/Additional-Popups/Behaviours/AddBehaviour.Designer.cs
rename to PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.Designer.cs
index 3fc760c7..57710abd 100644
--- a/PCK-Studio/Forms/Additional-Popups/Behaviours/AddBehaviour.Designer.cs
+++ b/PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.Designer.cs
@@ -1,6 +1,6 @@
-namespace PckStudio.Forms.Additional_Popups.Behaviours
+namespace PckStudio.Forms.Additional_Popups.EntryForms
 {
-	partial class AddBehaviour
+	partial class AddEntry
 	{
 		/// <summary>
 		/// Required designer variable.
diff --git a/PCK-Studio/Forms/Additional-Popups/Behaviours/AddBehaviour.cs b/PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.cs
similarity index 95%
rename from PCK-Studio/Forms/Additional-Popups/Behaviours/AddBehaviour.cs
rename to PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.cs
index 68932bbc..eb88ae9d 100644
--- a/PCK-Studio/Forms/Additional-Popups/Behaviours/AddBehaviour.cs
+++ b/PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.cs
@@ -5,9 +5,9 @@ using MetroFramework.Forms;
 using Newtonsoft.Json.Linq;
 using PckStudio.Forms.Utilities;
 
-namespace PckStudio.Forms.Additional_Popups.Behaviours
+namespace PckStudio.Forms.Additional_Popups.EntryForms
 {
-	public partial class AddBehaviour : MetroForm
+	public partial class AddEntry : MetroForm
 	{
         string selectedEntity = "";
 
@@ -15,7 +15,7 @@ namespace PckStudio.Forms.Additional_Popups.Behaviours
 
 		List<TreeNode> treeViewEntityCache = new List<TreeNode>();
 
-		public AddBehaviour()
+		public AddEntry()
 		{
 			InitializeComponent();
 			ImageList entities = new ImageList();
diff --git a/PCK-Studio/Forms/Additional-Popups/Behaviours/AddBehaviour.resx b/PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.resx
similarity index 100%
rename from PCK-Studio/Forms/Additional-Popups/Behaviours/AddBehaviour.resx
rename to PCK-Studio/Forms/Additional-Popups/EntityForms/AddEntry.resx
diff --git a/PCK-Studio/Forms/Editor/BehaviourEditor.cs b/PCK-Studio/Forms/Editor/BehaviourEditor.cs
index fba21a3e..731db9aa 100644
--- a/PCK-Studio/Forms/Editor/BehaviourEditor.cs
+++ b/PCK-Studio/Forms/Editor/BehaviourEditor.cs
@@ -152,7 +152,7 @@ namespace PckStudio.Forms.Editor
 			if (treeView1.SelectedNode == null) return;
 			if (!(treeView1.SelectedNode.Tag is BehaviourFile.RiderPositionOverride entry)) return;
 
-			var diag = new Additional_Popups.Behaviours.AddBehaviour();
+			var diag = new Additional_Popups.EntryForms.AddEntry();
 			diag.acceptBtn.Text = "Save";
 
 			if (diag.ShowDialog() == DialogResult.OK)
@@ -204,7 +204,7 @@ namespace PckStudio.Forms.Editor
 
 		private void addNewEntryToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var diag = new Additional_Popups.Behaviours.AddBehaviour();
+			var diag = new Additional_Popups.EntryForms.AddEntry();
 
 			if(diag.ShowDialog() == DialogResult.OK)
 			{
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index bb9efcd0..b62172bd 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -18,44 +18,41 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-	<Target Name="GetGitHash" BeforeTargets="WriteGitHash" Condition="'$(BuildHash)' == ''">
-		<PropertyGroup>
-			<!-- temp file for the git version (lives in "obj" folder)-->
-			<VerFile>$(IntermediateOutputPath)gitver</VerFile>
-		</PropertyGroup>
-
-		<!-- write the hash to the temp file.-->
-		<Exec Command="git -C $(ProjectDir) describe --always &gt; $(VerFile)" />
-
-		<!-- read the version into the GitVersion itemGroup-->
-		<ReadLinesFromFile File="$(VerFile)">
-			<Output TaskParameter="Lines" ItemName="GitVersion" />
-		</ReadLinesFromFile>
-		<!-- Set the BuildHash property to contain the GitVersion, if it wasn't already set.-->
-		<PropertyGroup>
-			<BuildHash>@(GitVersion)</BuildHash>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="WriteGitHash" BeforeTargets="CoreCompile">
-		<!-- names the obj/.../GitAssemblyInfo.cs file -->
-		<PropertyGroup>
-			<GitAssemblyInfoFile>$(IntermediateOutputPath)GitAssemblyInfo.cs</GitAssemblyInfoFile>
-		</PropertyGroup>
-		<!-- includes the GitAssemblyInfo for compilation into your project -->
-		<ItemGroup>
-			<Compile Include="$(GitAssemblyInfoFile)" />
-		</ItemGroup>
-		<!-- defines the AssemblyMetadata attribute that will be written -->
-		<ItemGroup>
-			<AssemblyAttributes Include="AssemblyMetadata">
-				<_Parameter1>GitHash</_Parameter1>
-				<_Parameter2>$(BuildHash)</_Parameter2>
-			</AssemblyAttributes>
-		</ItemGroup>
-		<!-- writes the attribute to the GitAssemblyInfo file -->
-		<WriteCodeFragment Language="C#" OutputFile="$(GitAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
-	</Target>
+  <Target Name="GetGitHash" BeforeTargets="WriteGitHash" Condition="'$(BuildHash)' == ''">
+    <PropertyGroup>
+      <!-- temp file for the git version (lives in "obj" folder)-->
+      <VerFile>$(IntermediateOutputPath)gitver</VerFile>
+    </PropertyGroup>
+    <!-- write the hash to the temp file.-->
+    <Exec Command="git -C $(ProjectDir) describe --always &gt; $(VerFile)" />
+    <!-- read the version into the GitVersion itemGroup-->
+    <ReadLinesFromFile File="$(VerFile)">
+      <Output TaskParameter="Lines" ItemName="GitVersion" />
+    </ReadLinesFromFile>
+    <!-- Set the BuildHash property to contain the GitVersion, if it wasn't already set.-->
+    <PropertyGroup>
+      <BuildHash>@(GitVersion)</BuildHash>
+    </PropertyGroup>
+  </Target>
+  <Target Name="WriteGitHash" BeforeTargets="CoreCompile">
+    <!-- names the obj/.../GitAssemblyInfo.cs file -->
+    <PropertyGroup>
+      <GitAssemblyInfoFile>$(IntermediateOutputPath)GitAssemblyInfo.cs</GitAssemblyInfoFile>
+    </PropertyGroup>
+    <!-- includes the GitAssemblyInfo for compilation into your project -->
+    <ItemGroup>
+      <Compile Include="$(GitAssemblyInfoFile)" />
+    </ItemGroup>
+    <!-- defines the AssemblyMetadata attribute that will be written -->
+    <ItemGroup>
+      <AssemblyAttributes Include="AssemblyMetadata">
+        <_Parameter1>GitHash</_Parameter1>
+        <_Parameter2>$(BuildHash)</_Parameter2>
+      </AssemblyAttributes>
+    </ItemGroup>
+    <!-- writes the attribute to the GitAssemblyInfo file -->
+    <WriteCodeFragment Language="C#" OutputFile="$(GitAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
+  </Target>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -243,11 +240,11 @@
     <Compile Include="Classes\Networking\Update.cs" />
     <Compile Include="Classes\Utils\GRF\CRC32.cs" />
     <Compile Include="Classes\Utils\RLE.cs" />
-    <Compile Include="Forms\Additional-Popups\Behaviours\AddBehaviour.cs">
+    <Compile Include="Forms\Additional-Popups\EntityForms\AddEntry.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Additional-Popups\Behaviours\AddBehaviour.Designer.cs">
-      <DependentUpon>AddBehaviour.cs</DependentUpon>
+    <Compile Include="Forms\Additional-Popups\EntityForms\AddEntry.Designer.cs">
+      <DependentUpon>AddEntry.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\Additional-Popups\Loc\AddLanguage.cs">
       <SubType>Form</SubType>
@@ -499,8 +496,8 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Classes\Utils\3DS\TextureCodec.cs" />
-    <EmbeddedResource Include="Forms\Additional-Popups\Behaviours\AddBehaviour.resx">
-      <DependentUpon>AddBehaviour.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Additional-Popups\EntityForms\AddEntry.resx">
+      <DependentUpon>AddEntry.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\Additional-Popups\Loc\AddLanguage.resx">
       <DependentUpon>AddLanguage.cs</DependentUpon>