diff --git a/src/Core/CsMic.Core.csproj b/src/Core/CsMic.Core.csproj
index f6c72b7..7daac77 100644
--- a/src/Core/CsMic.Core.csproj
+++ b/src/Core/CsMic.Core.csproj
@@ -2,17 +2,17 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<RootNamespace>CsMic</RootNamespace>
+		<RootNamespace>CSMic</RootNamespace>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-		<AssemblyName>CsMic.Core</AssemblyName>
+		<AssemblyName>CSMic.Core</AssemblyName>
 		<Version>2.0.0-beta-01</Version>
-		<PackageId>CsMic</PackageId>
+		<PackageId>CSMic</PackageId>
 	</PropertyGroup>
 
 	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-		<Exec Command="dotnet tool run coco -namespace CsMic.Interpreter -frames $(ProjectDir)cocor $(ProjectDir)cocor/Interpreter.atg" />
+		<Exec Command="dotnet tool run coco -namespace CSMic.Interpreter -frames $(ProjectDir)CocoR $(ProjectDir)CocoR/Interpreter.atg" />
 	</Target>
 
 	<Import Project="NuGetPublish.targets" Condition="Exists('NuGetPublish.targets')" />
diff --git a/src/Core/FunctionArgument.cs b/src/Core/FunctionArgument.cs
index 86e9d93..80b5d6f 100644
--- a/src/Core/FunctionArgument.cs
+++ b/src/Core/FunctionArgument.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CsMic
+namespace CSMic
 {
     public class FunctionArgument
     {
diff --git a/src/Core/FunctionValue.cs b/src/Core/FunctionValue.cs
index 8f7398f..9d74307 100644
--- a/src/Core/FunctionValue.cs
+++ b/src/Core/FunctionValue.cs
@@ -1,11 +1,11 @@
-using CsMic;
+using CSMic;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CsMic
+namespace CSMic
 {
     public class FunctionValue
     {
diff --git a/src/Core/FunctionValueType.cs b/src/Core/FunctionValueType.cs
index 9a8f140..5649c92 100644
--- a/src/Core/FunctionValueType.cs
+++ b/src/Core/FunctionValueType.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CsMic
+namespace CSMic
 {
     public enum FunctionValueType
     {
diff --git a/src/Core/ICodedFunction.cs b/src/Core/ICodedFunction.cs
index d7642bd..d81e7d8 100644
--- a/src/Core/ICodedFunction.cs
+++ b/src/Core/ICodedFunction.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CsMic
+namespace CSMic
 {
     public interface ICodedFunction
     {
diff --git a/src/Core/InputInterpreter.cs b/src/Core/InputInterpreter.cs
index d3a8533..8156c15 100644
--- a/src/Core/InputInterpreter.cs
+++ b/src/Core/InputInterpreter.cs
@@ -2,7 +2,7 @@
 using System.Text;
 using System.IO;
 
-namespace CsMic
+namespace CSMic
 {
     public class InputInterpreter
     {
@@ -122,8 +122,8 @@ namespace CsMic
             // Create a child interpreter sharing stores, so ProduceOutput doesn't affect parent state
             var child = new InputInterpreter(this);
             using var ms = new MemoryStream(Encoding.UTF8.GetBytes(expressionText));
-            var scanner = new CsMic.Interpreter.Scanner(ms);
-            var parser = new CsMic.Interpreter.Parser(scanner)
+            var scanner = new CSMic.Interpreter.Scanner(ms);
+            var parser = new CSMic.Interpreter.Parser(scanner)
             {
                 Interpreter = child
             };
@@ -138,8 +138,8 @@ namespace CsMic
             try
             {
                 using var ms = new MemoryStream(Encoding.UTF8.GetBytes(input ?? string.Empty));
-                var scanner = new CsMic.Interpreter.Scanner(ms);
-                var parser = new CsMic.Interpreter.Parser(scanner)
+                var scanner = new CSMic.Interpreter.Scanner(ms);
+                var parser = new CSMic.Interpreter.Parser(scanner)
                 {
                     Interpreter = this
                 };
diff --git a/src/Core/NuGetPublish.targets b/src/Core/NuGetPublish.targets
index 1b90dd3..dfe580a 100644
--- a/src/Core/NuGetPublish.targets
+++ b/src/Core/NuGetPublish.targets
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Placeholder target file for NuGet publishing -->
   <Target Name="PublishNuGet" AfterTargets="Pack">
-	  <Exec Command="dotnet nuget push --source wagenet-git bin\Release\CsMic.$(Version).nupkg" />
+	  <Exec Command="dotnet nuget push --source wagenet-git bin\Release\CSMic.$(Version).nupkg" />
   </Target>
 </Project>
diff --git a/src/Core/Variable.cs b/src/Core/Variable.cs
index 4a57322..434daa1 100644
--- a/src/Core/Variable.cs
+++ b/src/Core/Variable.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CsMic
+namespace CSMic
 {
     public class Variable
     {
diff --git a/src/Core/VariableType.cs b/src/Core/VariableType.cs
index 06f16be..ada5056 100644
--- a/src/Core/VariableType.cs
+++ b/src/Core/VariableType.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CsMic
+namespace CSMic
 {
     public enum VariableType
     {
diff --git a/src/Core/cocor/Interpreter.atg b/src/Core/cocor/Interpreter.atg
index b44a7d6..2a641ba 100644
--- a/src/Core/cocor/Interpreter.atg
+++ b/src/Core/cocor/Interpreter.atg
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Text;
 using System.Collections.Generic;
-using CsMic;
+using CSMic;
 
 COMPILER INTERPRETER
 
diff --git a/src/CsMic.sln b/src/CsMic.sln
index ce873a4..8287e3d 100644
--- a/src/CsMic.sln
+++ b/src/CsMic.sln
@@ -1,37 +1,31 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.12.35707.178
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsMic.Core", "Core\CsMic.Core.csproj", "{5387FF55-3044-4EB4-BB90-AD2E922131C1}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6394EDF0-24F7-4B75-B4CE-E5F884EE88AC}"
 	ProjectSection(SolutionItems) = preProject
 		setup.ps1 = setup.ps1
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsMic.Tests", "Tests\CsMic.Tests.csproj", "{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSMic.Core", "Core\CSMic.Core.csproj", "{4DAA770D-1624-48D7-8D92-2B2067E21C27}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsMic.StandardLibrary", "StandardLibrary\CsMic.StandardLibrary.csproj", "{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSMic.StandardLibrary", "StandardLibrary\CSMic.StandardLibrary.csproj", "{1533FED0-C765-4929-8797-CE6C2E594DAB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
-		Description = CS-MIC is a .NET library written in C# designed to give developers easy access to expression parsing.
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5387FF55-3044-4EB4-BB90-AD2E922131C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5387FF55-3044-4EB4-BB90-AD2E922131C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5387FF55-3044-4EB4-BB90-AD2E922131C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5387FF55-3044-4EB4-BB90-AD2E922131C1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F356A0E2-1338-43FE-B4C0-1AE7C9F0685F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7AD600D-4247-49CE-9A26-B20C6F2FF6AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DAA770D-1624-48D7-8D92-2B2067E21C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DAA770D-1624-48D7-8D92-2B2067E21C27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DAA770D-1624-48D7-8D92-2B2067E21C27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DAA770D-1624-48D7-8D92-2B2067E21C27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1533FED0-C765-4929-8797-CE6C2E594DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1533FED0-C765-4929-8797-CE6C2E594DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1533FED0-C765-4929-8797-CE6C2E594DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1533FED0-C765-4929-8797-CE6C2E594DAB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/StandardLibrary/Constants.cs b/src/StandardLibrary/Constants.cs
index a458182..dacfc9f 100644
--- a/src/StandardLibrary/Constants.cs
+++ b/src/StandardLibrary/Constants.cs
@@ -1,6 +1,6 @@
-using CsMic;
+using CSMic;
 
-namespace CsMic.StandardLibrary
+namespace CSMic.StandardLibrary
 {
     public static class Constants
     {
diff --git a/src/StandardLibrary/CsMic.StandardLibrary.csproj b/src/StandardLibrary/CsMic.StandardLibrary.csproj
index 3931d94..78bd2a7 100644
--- a/src/StandardLibrary/CsMic.StandardLibrary.csproj
+++ b/src/StandardLibrary/CsMic.StandardLibrary.csproj
@@ -2,18 +2,20 @@
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <RootNamespace>CsMic.StandardLibrary</RootNamespace>
-    <AssemblyName>CsMic.StandardLibrary</AssemblyName>
+    <RootNamespace>CSMic.StandardLibrary</RootNamespace>
+    <AssemblyName>CSMic.StandardLibrary</AssemblyName>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Core\CsMic.Core.csproj" />
+    <Compile Remove="Functions\hyperbolic\**" />
+    <EmbeddedResource Remove="Functions\hyperbolic\**" />
+    <None Remove="Functions\hyperbolic\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="functions\hyperbolic\" />
+    <ProjectReference Include="..\Core\CSMic.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/StandardLibrary/Functions.cs b/src/StandardLibrary/Functions.cs
index 00a077b..10c88fe 100644
--- a/src/StandardLibrary/Functions.cs
+++ b/src/StandardLibrary/Functions.cs
@@ -1,12 +1,12 @@
-using CsMic;
-using CsMic.StandardLibrary.Functions;
+using CSMic;
+using CSMic.StandardLibrary.Functions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CsMic.StandardLibrary
+namespace CSMic.StandardLibrary
 {
     public static class Functions
     {
diff --git a/src/StandardLibrary/functions/AbsoluteValue.cs b/src/StandardLibrary/functions/AbsoluteValue.cs
index 141c6e2..d40bca8 100644
--- a/src/StandardLibrary/functions/AbsoluteValue.cs
+++ b/src/StandardLibrary/functions/AbsoluteValue.cs
@@ -1,7 +1,6 @@
-using CsMic;
-using FunctionValueType = CsMic.FunctionValueType;
+using CSMic;
 
-namespace CsMic.StandardLibrary.Functions
+namespace CSMic.StandardLibrary.Functions
 {
     public class AbsoluteValue : FunctionBase, ICodedFunction
     {
diff --git a/src/StandardLibrary/functions/FunctionBase.cs b/src/StandardLibrary/functions/FunctionBase.cs
index 94ce5ec..eff760f 100644
--- a/src/StandardLibrary/functions/FunctionBase.cs
+++ b/src/StandardLibrary/functions/FunctionBase.cs
@@ -1,7 +1,6 @@
-using CsMic;
-using FunctionValueType = CsMic.FunctionValueType;
+using CSMic;
 
-namespace CsMic.StandardLibrary.Functions
+namespace CSMic.StandardLibrary.Functions
 {
     public abstract class FunctionBase
     {
diff --git a/src/StandardLibrary/functions/Max.cs b/src/StandardLibrary/functions/Max.cs
index 2d44115..6a62f27 100644
--- a/src/StandardLibrary/functions/Max.cs
+++ b/src/StandardLibrary/functions/Max.cs
@@ -1,11 +1,11 @@
-using CsMic;
+using CSMic;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CsMic.StandardLibrary.Functions
+namespace CSMic.StandardLibrary.Functions
 {
     public class Max : FunctionBase, ICodedFunction
     {
diff --git a/src/StandardLibrary/functions/Min.cs b/src/StandardLibrary/functions/Min.cs
index e4d4e7e..620262e 100644
--- a/src/StandardLibrary/functions/Min.cs
+++ b/src/StandardLibrary/functions/Min.cs
@@ -1,11 +1,11 @@
-using CsMic;
+using CSMic;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CsMic.StandardLibrary.Functions
+namespace CSMic.StandardLibrary.Functions
 {
     public class Min : FunctionBase, ICodedFunction
     {
diff --git a/src/StandardLibrary/functions/Sign.cs b/src/StandardLibrary/functions/Sign.cs
index 4b02a9d..8d9c48a 100644
--- a/src/StandardLibrary/functions/Sign.cs
+++ b/src/StandardLibrary/functions/Sign.cs
@@ -1,7 +1,7 @@
-using CsMic;
-using FunctionValueType = CsMic.FunctionValueType;
+using CSMic;
 
-namespace CsMic.StandardLibrary.Functions
+
+namespace CSMic.StandardLibrary.Functions
 {
     public class Sign : FunctionBase, ICodedFunction
     {
diff --git a/src/Tests/CsMic.Tests.csproj b/src/Tests/CCMic.Tests.csproj
similarity index 78%
rename from src/Tests/CsMic.Tests.csproj
rename to src/Tests/CCMic.Tests.csproj
index 79d7625..8958b81 100644
--- a/src/Tests/CsMic.Tests.csproj
+++ b/src/Tests/CCMic.Tests.csproj
@@ -6,8 +6,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-    <RootNamespace>CsMic.Tests</RootNamespace>
-    <AssemblyName>CsMic.Tests</AssemblyName>
+    <RootNamespace>CSMic.Tests</RootNamespace>
+    <AssemblyName>CSMic.Tests</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,8 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Core\CsMic.Core.csproj" />
-    <ProjectReference Include="..\StandardLibrary\CsMic.StandardLibrary.csproj" />
+    <ProjectReference Include="..\Core\CSMic.Core.csproj" />
+    <ProjectReference Include="..\StandardLibrary\CSMic.StandardLibrary.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Tests/InputInterpreterTests.cs b/src/Tests/InputInterpreterTests.cs
index 18ec19b..bda2886 100644
--- a/src/Tests/InputInterpreterTests.cs
+++ b/src/Tests/InputInterpreterTests.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
-using CsMic;
+using CSMic;
 
-namespace CsMic.Tests;
+namespace CSMic.Tests;
 
 public class InputInterpreterTests
 {
diff --git a/src/Tests/StdlibFunctionsTests.cs b/src/Tests/StdlibFunctionsTests.cs
index 40685cf..add1b05 100644
--- a/src/Tests/StdlibFunctionsTests.cs
+++ b/src/Tests/StdlibFunctionsTests.cs
@@ -1,11 +1,11 @@
-using CsMic;
-using CsMic.StandardLibrary;
+using CSMic;
+using CSMic.StandardLibrary;
 using NUnit.Framework;
-using CsMic.StandardLibrary.Functions;
+using CSMic.StandardLibrary.Functions;
 using System.Globalization;
 using System.Reflection.Metadata;
 
-namespace CsMic.Tests;
+namespace CSMic.Tests;
 
 public class StdlibFunctionsTests
 {