diff --git a/src/CalcManager/CEngine/scimath.cpp b/src/CalcManager/CEngine/RationalMath.cpp
similarity index 99%
rename from src/CalcManager/CEngine/scimath.cpp
rename to src/CalcManager/CEngine/RationalMath.cpp
index 5062323..46b5a08 100644
--- a/src/CalcManager/CEngine/scimath.cpp
+++ b/src/CalcManager/CEngine/RationalMath.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
-#include "Header Files/scimath.h"
+#include "Header Files/RationalMath.h"
 
 using namespace std;
 using namespace CalcEngine;
diff --git a/src/CalcManager/CalcManager.vcxproj b/src/CalcManager/CalcManager.vcxproj
index 868abfe..4455336 100644
--- a/src/CalcManager/CalcManager.vcxproj
+++ b/src/CalcManager/CalcManager.vcxproj
@@ -281,7 +281,7 @@
     <ClInclude Include="Header Files\Number.h" />
     <ClInclude Include="Header Files\RadixType.h" />
     <ClInclude Include="Header Files\Rational.h" />
-    <ClInclude Include="Header Files\scimath.h" />
+    <ClInclude Include="Header Files\RationalMath.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="Ratpack\CalcErr.h" />
     <ClInclude Include="Ratpack\ratconst.h" />
@@ -300,7 +300,7 @@
     <ClCompile Include="CEngine\scicomm.cpp" />
     <ClCompile Include="CEngine\scidisp.cpp" />
     <ClCompile Include="CEngine\scifunc.cpp" />
-    <ClCompile Include="CEngine\scimath.cpp" />
+    <ClCompile Include="CEngine\RationalMath.cpp" />
     <ClCompile Include="CEngine\scioper.cpp" />
     <ClCompile Include="CEngine\sciset.cpp" />
     <ClCompile Include="ExpressionCommand.cpp" />
diff --git a/src/CalcManager/CalcManager.vcxproj.filters b/src/CalcManager/CalcManager.vcxproj.filters
index 14a28e8..5ceff3e 100644
--- a/src/CalcManager/CalcManager.vcxproj.filters
+++ b/src/CalcManager/CalcManager.vcxproj.filters
@@ -32,9 +32,6 @@
     <ClCompile Include="CEngine\scifunc.cpp">
       <Filter>CEngine</Filter>
     </ClCompile>
-    <ClCompile Include="CEngine\scimath.cpp">
-      <Filter>CEngine</Filter>
-    </ClCompile>
     <ClCompile Include="CEngine\scioper.cpp">
       <Filter>CEngine</Filter>
     </ClCompile>
@@ -89,6 +86,9 @@
     <ClCompile Include="CEngine\Rational.cpp">
       <Filter>CEngine</Filter>
     </ClCompile>
+    <ClCompile Include="CEngine\RationalMath.cpp">
+      <Filter>CEngine</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Command.h" />
@@ -110,9 +110,6 @@
     <ClInclude Include="Header Files\EngineStrings.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Header Files\scimath.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Ratpack\CalcErr.h">
       <Filter>RatPack</Filter>
     </ClInclude>
@@ -164,5 +161,8 @@
     <ClInclude Include="Header Files\RadixType.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Header Files\RationalMath.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/CalcManager/Header Files/CalcEngine.h b/src/CalcManager/Header Files/CalcEngine.h
index 626f395..2e59cdb 100644
--- a/src/CalcManager/Header Files/CalcEngine.h	
+++ b/src/CalcManager/Header Files/CalcEngine.h	
@@ -23,8 +23,8 @@
 #include "History.h"  // for History Collector
 #include "CalcInput.h"
 #include "ICalcDisplay.h"
-#include "scimath.h"
 #include "Rational.h"
+#include "RationalMath.h"
 
 // The following are NOT real exports of CalcEngine, but for forward declarations
 // The real exports follows later
diff --git a/src/CalcManager/Header Files/Number.h b/src/CalcManager/Header Files/Number.h
index f832a84..c67aa10 100644
--- a/src/CalcManager/Header Files/Number.h	
+++ b/src/CalcManager/Header Files/Number.h	
@@ -1,4 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 #pragma once
 
diff --git a/src/CalcManager/Header Files/Rational.h b/src/CalcManager/Header Files/Rational.h
index 7b73585..8ded3c2 100644
--- a/src/CalcManager/Header Files/Rational.h	
+++ b/src/CalcManager/Header Files/Rational.h	
@@ -1,4 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 #pragma once
 
diff --git a/src/CalcManager/Header Files/scimath.h b/src/CalcManager/Header Files/RationalMath.h
similarity index 98%
rename from src/CalcManager/Header Files/scimath.h
rename to src/CalcManager/Header Files/RationalMath.h
index 06be9e8..b52c1c5 100644
--- a/src/CalcManager/Header Files/scimath.h	
+++ b/src/CalcManager/Header Files/RationalMath.h	
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+#pragma once
+
 #include "Rational.h"
 
 namespace CalcEngine::RationalMath