diff --git a/src/CalcManager/CEngine/scicomm.cpp b/src/CalcManager/CEngine/scicomm.cpp
index f052df89..04bdda74 100644
--- a/src/CalcManager/CEngine/scicomm.cpp
+++ b/src/CalcManager/CEngine/scicomm.cpp
@@ -35,7 +35,7 @@ namespace
             IDC_ADD,2, IDC_SUB,2,
             IDC_RSHF,3, IDC_LSHF,3, IDC_RSHFL,3,
             IDC_MOD,3, IDC_DIV,3, IDC_MUL,3,
-            IDC_PWR,4, IDC_ROOT,4, IDC_LOGBASEX,4 };
+            IDC_PWR,4, IDC_ROOT,4, IDC_LOGBASEY,4 };
 
         for (unsigned int iPrec = 0; iPrec < size(rgbPrec); iPrec += 2)
         {
@@ -948,7 +948,7 @@ static const std::unordered_map<int, FunctionNameElement> operatorStringTable =
     { IDC_SIGN, { SIDS_NEGATE } },
     { IDC_DEGREES, { SIDS_DEGREES } },
     { IDC_POW2, { SIDS_TWOPOWX } },
-    { IDC_LOGBASEX, { SIDS_LOGBASEX } },
+    { IDC_LOGBASEY, { SIDS_LOGBASEY } },
     { IDC_ABS, { SIDS_ABS } },
     { IDC_CEIL, { SIDS_CEIL } },
     { IDC_FLOOR, { SIDS_FLOOR } },
diff --git a/src/CalcManager/CEngine/scioper.cpp b/src/CalcManager/CEngine/scioper.cpp
index cd734a0a..fdb9a7c0 100644
--- a/src/CalcManager/CEngine/scioper.cpp
+++ b/src/CalcManager/CEngine/scioper.cpp
@@ -158,8 +158,8 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa
             result = Root(rhs, result);
             break;
 
-        case IDC_LOGBASEX:
-            result = (Log(result) / Log(rhs));
+        case IDC_LOGBASEY:
+            result = (Log(rhs) / Log(result));
             break;
         }
     }
diff --git a/src/CalcManager/Command.h b/src/CalcManager/Command.h
index 4331ddf7..764a2227 100644
--- a/src/CalcManager/Command.h
+++ b/src/CalcManager/Command.h
@@ -172,7 +172,7 @@ namespace CalculationManager
         CommandCeil = 415,
         CommandROLC = 416,
         CommandRORC = 417,
-        CommandLogBaseX = 500,
+        CommandLogBaseY = 500,
         CommandNand = 501,
         CommandNor = 502,
 
diff --git a/src/CalcManager/Header Files/CCommand.h b/src/CalcManager/Header Files/CCommand.h
index f6d74d25..440c6283 100644
--- a/src/CalcManager/Header Files/CCommand.h	
+++ b/src/CalcManager/Header Files/CCommand.h	
@@ -166,7 +166,7 @@
 #define IDC_LASTCONTROL IDC_CEIL
 
 #define IDC_BINARYEXTENDEDFIRST 500
-#define IDC_LOGBASEX            500 // logx(y)
+#define IDC_LOGBASEY            500 // logy(x)
 #define IDC_NAND                501 // Nand
 #define IDC_NOR                 502 // Nor
 
diff --git a/src/CalcManager/Header Files/EngineStrings.h b/src/CalcManager/Header Files/EngineStrings.h
index 958c828b..7e093237 100644
--- a/src/CalcManager/Header Files/EngineStrings.h	
+++ b/src/CalcManager/Header Files/EngineStrings.h	
@@ -196,7 +196,7 @@ inline constexpr auto SIDS_ACSCH = L"InverseCsch";
 inline constexpr auto SIDS_COTH = L"Coth";
 inline constexpr auto SIDS_ACOTH = L"InverseCoth";
 inline constexpr auto SIDS_TWOPOWX = L"TwoPowX";
-inline constexpr auto SIDS_LOGBASEX = L"LogBaseX";
+inline constexpr auto SIDS_LOGBASEY = L"LogBaseY";
 inline constexpr auto SIDS_ABS = L"Abs";
 inline constexpr auto SIDS_FLOOR = L"Floor";
 inline constexpr auto SIDS_CEIL = L"Ceil";
@@ -352,7 +352,7 @@ inline constexpr std::array<std::wstring_view, 152> g_sids =
     SIDS_COTH,
     SIDS_ACOTH,
     SIDS_TWOPOWX,
-    SIDS_LOGBASEX,
+    SIDS_LOGBASEY,
     SIDS_ABS,
     SIDS_FLOOR,
     SIDS_CEIL,
diff --git a/src/CalcViewModel/Common/CalculatorButtonUser.h b/src/CalcViewModel/Common/CalculatorButtonUser.h
index bc03b0ad..a7b72189 100644
--- a/src/CalcViewModel/Common/CalculatorButtonUser.h
+++ b/src/CalcViewModel/Common/CalculatorButtonUser.h
@@ -109,7 +109,7 @@ public
         InvCoth = (int) CM::Command::CommandACOTH,
         CubeRoot = (int) CM::Command::CommandCUBEROOT,
         TwoPowerX = (int) CM::Command::CommandPOW2,
-        LogBaseX = (int) CM::Command::CommandLogBaseX,
+        LogBaseY = (int) CM::Command::CommandLogBaseY,
         Nand = (int) CM::Command::CommandNand,
         Nor = (int) CM::Command::CommandNor,
         Abs = (int) CM::Command::CommandAbs,
diff --git a/src/CalcViewModel/Common/LocalizationService.cpp b/src/CalcViewModel/Common/LocalizationService.cpp
index 9060b04a..c7fb9e0c 100644
--- a/src/CalcViewModel/Common/LocalizationService.cpp
+++ b/src/CalcViewModel/Common/LocalizationService.cpp
@@ -545,7 +545,7 @@ unordered_map<wstring, wstring> LocalizationService::GetTokenToReadableNameMap()
     static vector<pair<wstring, wstring>> s_noParenEngineKeyResourceMap = { // Programmer mode functions
                                                                             make_pair<wstring, wstring>(L"9", L"LeftShift"),
                                                                             make_pair<wstring, wstring>(L"10", L"RightShift"),
-                                                                            make_pair<wstring, wstring>(L"LogBaseX", L"Logx"),
+                                                                            make_pair<wstring, wstring>(L"LogBaseY", L"Logy"),
 
                                                                             // Y Root scientific function
                                                                             make_pair<wstring, wstring>(L"16", L"YRoot")
diff --git a/src/Calculator/Resources/en-US/CEngineStrings.resw b/src/Calculator/Resources/en-US/CEngineStrings.resw
index 0cea3adf..fff1d672 100644
--- a/src/Calculator/Resources/en-US/CEngineStrings.resw
+++ b/src/Calculator/Resources/en-US/CEngineStrings.resw
@@ -517,8 +517,8 @@
     <value>2^</value>
     <comment>{Locked}The string that represents the function</comment>
   </data>
-  <data name="LogBaseX" xml:space="preserve">
-    <value>base log</value>
+  <data name="LogBaseY" xml:space="preserve">
+    <value>log base</value>
     <comment>{Locked}The string that represents the function</comment>
   </data>
   <data name="Abs" xml:space="preserve">
diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index 93ac9197..43fc75e3 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -3447,9 +3447,9 @@
     <value>Cube Root</value>
     <comment>Name for the cube root function. Used by screen readers.</comment>
   </data>
-  <data name="Logx" xml:space="preserve">
-    <value>Base Log</value>
-    <comment>Name for the logbasex function. Used by screen readers.</comment>
+  <data name="Logy" xml:space="preserve">
+    <value>Log Base</value>
+    <comment>Name for the logbasey function. Used by screen readers.</comment>
   </data>
   <data name="AbsoluteValue" xml:space="preserve">
     <value>Absolute Value</value>
@@ -3519,11 +3519,11 @@
     <value>Calculation failed</value>
     <comment>Text displayed when the application is not able to do a calculation</comment>
   </data>
-  <data name="logBaseX.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Log base X</value>
-    <comment>Screen reader prompt for the logBaseX button</comment>
+  <data name="logBaseY.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Log base Y</value>
+    <comment>Screen reader prompt for the logBaseY button</comment>
   </data>
-  <data name="logBaseX.[using:CalculatorApp.Common]KeyboardShortcutManager.VirtualKeyShiftChord" xml:space="preserve">
+  <data name="logBaseY.[using:CalculatorApp.Common]KeyboardShortcutManager.VirtualKeyShiftChord" xml:space="preserve">
     <value>L</value>
     <comment>{Locked}This is the character that should trigger this button. Note that it is a character and not a key, so it does not come from the Windows::System::VirtualKey enum.</comment>
   </data>
diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml b/src/Calculator/Views/CalculatorScientificOperators.xaml
index c2fe5ab9..2a614c52 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml
@@ -90,7 +90,7 @@
                         <Setter Target="FuncButton.IsEnabled" Value="False"/>
                         <Setter Target="EulerButton.IsEnabled" Value="False"/>
                         <Setter Target="AbsButton.IsEnabled" Value="False"/>
-                        <Setter Target="LogBaseX.IsEnabled" Value="False"/>
+                        <Setter Target="LogBaseY.IsEnabled" Value="False"/>
                         <Setter Target="TwoPowerXButton.IsEnabled" Value="False"/>
                         <Setter Target="CubeRootButton.IsEnabled" Value="False"/>
                     </VisualState.Setters>
@@ -148,7 +148,7 @@
 
                         <Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
                         <Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
-                        <Setter Target="LogBaseX.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
+                        <Setter Target="LogBaseY.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
                         <Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
                         <Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
 
@@ -238,7 +238,7 @@
 
                         <Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
                         <Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="LogBaseX.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="LogBaseY.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
                         <Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
                         <Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
 
@@ -326,7 +326,7 @@
 
                         <Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
                         <Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
-                        <Setter Target="LogBaseX.FontSize" Value="16"/>
+                        <Setter Target="LogBaseY.FontSize" Value="16"/>
                         <Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
                         <Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
 
@@ -1039,12 +1039,12 @@
                                            Click="ShiftButton_Uncheck"
                                            Content="&#xF882;"/>
 
-                <controls:CalculatorButton x:Name="LogBaseX"
-                                           x:Uid="logBaseX"
+                <controls:CalculatorButton x:Name="LogBaseY"
+                                           x:Uid="logBaseY"
                                            Grid.Row="4"
                                            Style="{StaticResource EmphasizedCalcButtonStyle}"
-                                           AutomationProperties.AutomationId="logBaseX"
-                                           ButtonId="LogBaseX"
+                                           AutomationProperties.AutomationId="logBaseY"
+                                           ButtonId="LogBaseY"
                                            Click="ShiftButton_Uncheck"
                                            Content="&#xF883;"/>
 
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
index ded7bbc4..fb925f4e 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
@@ -80,7 +80,7 @@
 
                         <Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
                         <Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
-                        <Setter Target="LogBaseX.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
+                        <Setter Target="LogBaseY.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
                         <Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
                         <Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
 
@@ -185,7 +185,7 @@
 
                         <Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
                         <Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
-                        <Setter Target="LogBaseX.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
+                        <Setter Target="LogBaseY.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
                         <Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
                         <Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
 
@@ -288,7 +288,7 @@
 
                         <Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
                         <Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
-                        <Setter Target="LogBaseX.FontSize" Value="16"/>
+                        <Setter Target="LogBaseY.FontSize" Value="16"/>
                         <Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
                         <Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
 
@@ -1049,12 +1049,12 @@
                                                Content="&#xF882;"
                                                IsTabStop="false"/>
 
-                    <controls:CalculatorButton x:Name="LogBaseX"
-                                               x:Uid="logBaseX"
+                    <controls:CalculatorButton x:Name="LogBaseY"
+                                               x:Uid="logBaseY"
                                                Grid.Row="4"
                                                Style="{StaticResource EmphasizedCalcButtonStyle}"
-                                               AutomationProperties.AutomationId="logBaseX"
-                                               ButtonId="LogBaseX"
+                                               AutomationProperties.AutomationId="logBaseY"
+                                               ButtonId="LogBaseY"
                                                Click="ShiftButton_Uncheck"
                                                Content="&#xF883;"
                                                IsTabStop="false"/>
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cpp b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cpp
index 5c2fb55e..67abc0b0 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cpp
+++ b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cpp
@@ -63,7 +63,7 @@ static const std::unordered_map<NumbersAndOperatorsEnum, std::tuple<Platform::St
     { NumbersAndOperatorsEnum::CubeRoot, { L"cbrt()", 5, 0 } },
     { NumbersAndOperatorsEnum::YRootX, { L"root(x" + StringReference(LocalizationSettings::GetInstance().GetListSeparator().data()) + L"n)", 7, 1 } },
     { NumbersAndOperatorsEnum::TwoPowerX, { L"2^", 2, 0 } },
-    { NumbersAndOperatorsEnum::LogBaseX, { "log(b" + StringReference(LocalizationSettings::GetInstance().GetListSeparator().data()) + L" x)", 4, 1 } },
+    { NumbersAndOperatorsEnum::LogBaseY, { "log(b" + StringReference(LocalizationSettings::GetInstance().GetListSeparator().data()) + L" x)", 4, 1 } },
     { NumbersAndOperatorsEnum::EPowerX, { L"e^", 4, 0 } },
     { NumbersAndOperatorsEnum::Abs, { L"abs()", 4, 0 } },
     { NumbersAndOperatorsEnum::X, { L"x", 1, 0 } },
diff --git a/src/CalculatorUnitTests/CalculatorManagerTest.cpp b/src/CalculatorUnitTests/CalculatorManagerTest.cpp
index 3dcf5ba9..ab8e83e8 100644
--- a/src/CalculatorUnitTests/CalculatorManagerTest.cpp
+++ b/src/CalculatorUnitTests/CalculatorManagerTest.cpp
@@ -613,8 +613,8 @@ namespace CalculatorManagerTest
         Command commands41[] = { Command::Command3, Command::CommandPNT, Command::Command8, Command::CommandCeil, Command::CommandNULL };
         TestDriver::Test(L"4", L"ceil(3.8)", commands41);
 
-        Command commands42[] = { Command::Command3, Command::CommandLogBaseX, Command::Command5, Command::CommandADD, Command::CommandNULL };
-        TestDriver::Test(L"1.464973520717927", L"3 base log 5 + ", commands42);
+        Command commands42[] = { Command::Command5, Command::CommandLogBaseY, Command::Command3, Command::CommandADD, Command::CommandNULL };
+        TestDriver::Test(L"1.464973520717927", L"5 log base 3 + ", commands42);
     }
 
     void CalculatorManagerTest::CalculatorManagerTestScientificParenthesis()