From 73d602cbc9e0342114cec2911d613d053e5bf890 Mon Sep 17 00:00:00 2001
From: Jacob Palecki <JacobPalecki@gmail.com>
Date: Sat, 13 Jul 2024 01:16:21 -0700
Subject: [PATCH] Rename motivity mode to synchronous, midpoint value to
 syncspeed

---
 ...cel-motivity.hpp => accel-synchronous.hpp} | 12 +--
 common/accel-union.hpp                        | 20 ++---
 common/common.vcxitems                        |  2 +-
 common/rawaccel-base.hpp                      |  2 +-
 grapher/Form1.Designer.cs                     | 76 +++++++++----------
 grapher/Form1.cs                              |  8 +-
 grapher/Layouts/ClassicLayout.cs              |  4 +-
 grapher/Layouts/DefaultLayout.cs              |  4 +-
 grapher/Layouts/JumpLayout.cs                 |  4 +-
 grapher/Layouts/LUTLayout.cs                  |  4 +-
 grapher/Layouts/LayoutBase.cs                 | 22 +++---
 grapher/Layouts/LinearLayout.cs               |  4 +-
 grapher/Layouts/NaturalLayout.cs              |  4 +-
 grapher/Layouts/OffLayout.cs                  |  4 +-
 grapher/Layouts/PowerLayout.cs                |  4 +-
 ...MotivityLayout.cs => SynchronousLayout.cs} | 12 +--
 grapher/Layouts/UnsupportedLayout.cs          |  4 +-
 grapher/Models/AccelGUIFactory.cs             | 24 +++---
 grapher/Models/Options/AccelTypeOptions.cs    | 26 +++----
 grapher/grapher.csproj                        |  4 +-
 wrapper-tests/SynchronousAccelTests.cs        |  2 +-
 wrapper/wrapper.cpp                           |  2 +-
 22 files changed, 124 insertions(+), 124 deletions(-)
 rename common/{accel-motivity.hpp => accel-synchronous.hpp} (91%)
 rename grapher/Layouts/{MotivityLayout.cs => SynchronousLayout.cs} (82%)

diff --git a/common/accel-motivity.hpp b/common/accel-synchronous.hpp
similarity index 91%
rename from common/accel-motivity.hpp
rename to common/accel-synchronous.hpp
index 4b92424..e3fa7e4 100644
--- a/common/accel-motivity.hpp
+++ b/common/accel-synchronous.hpp
@@ -4,10 +4,10 @@
 
 namespace rawaccel {
 
-	template <bool Gain> struct loglog_sigmoid;
+	template <bool Gain> struct activation_framework;
 
 	template <>
-	struct loglog_sigmoid<LEGACY> {
+	struct activation_framework<LEGACY> {
 		double log_motivity;
 		double gamma_const;
 		double log_syncspeed;
@@ -18,7 +18,7 @@ namespace rawaccel {
 		double minimum_sens;
 		double maximum_sens;
 
-		loglog_sigmoid(const accel_args& args) :
+		activation_framework(const accel_args& args) :
 			log_motivity(log(args.motivity)),
 			gamma_const(args.gamma / log_motivity),
 			log_syncspeed(log(args.sync_speed)),
@@ -73,20 +73,20 @@ namespace rawaccel {
 	};
 
 	template <>
-	struct loglog_sigmoid<GAIN> {
+	struct activation_framework<GAIN> {
 		enum { capacity = LUT_RAW_DATA_CAPACITY };
 
 		bool velocity;
 		fp_rep_range range;
 		double x_start;
 
-		loglog_sigmoid(const accel_args& args) 
+		activation_framework(const accel_args& args) 
 		{
 			init({ -3, 9, 8 }, true);
 
 			double sum = 0;
 			double a = 0;
-			auto sig = loglog_sigmoid<LEGACY>(args);
+			auto sig = activation_framework<LEGACY>(args);
 			auto sigmoid_sum = [&](double b) {
 				int partitions = 2;
 
diff --git a/common/accel-union.hpp b/common/accel-union.hpp
index 136db44..bb4f952 100644
--- a/common/accel-union.hpp
+++ b/common/accel-union.hpp
@@ -3,7 +3,7 @@
 #include "accel-classic.hpp"
 #include "accel-jump.hpp"
 #include "accel-lookup.hpp"
-#include "accel-motivity.hpp"
+#include "accel-synchronous.hpp"
 #include "accel-natural.hpp"
 #include "accel-noaccel.hpp"
 #include "accel-power.hpp"
@@ -21,8 +21,8 @@ namespace rawaccel {
         natural<LEGACY> natural_l;
         power<GAIN> power_g;
         power<LEGACY> power_l;
-        loglog_sigmoid<GAIN> loglog_sigmoid_g;
-        loglog_sigmoid<LEGACY> loglog_sigmoid_l;
+        activation_framework<GAIN> loglog_sigmoid_g;
+        activation_framework<LEGACY> loglog_sigmoid_l;
 
         template <template <bool> class AccelTemplate, typename Visitor>
         auto visit_helper(Visitor vis, bool gain)
@@ -35,13 +35,13 @@ namespace rawaccel {
         auto visit(Visitor vis, const accel_args& args)
         {
             switch (args.mode) {
-            case accel_mode::classic:  return visit_helper<classic>(vis, args.gain);
-            case accel_mode::jump:     return visit_helper<jump>(vis, args.gain);
-            case accel_mode::natural:  return visit_helper<natural>(vis, args.gain);
-            case accel_mode::motivity: return visit_helper<loglog_sigmoid>(vis, args.gain);
-            case accel_mode::power:    return visit_helper<power>(vis, args.gain);
-            case accel_mode::lookup:   return vis(lut);
-            default:                   return vis(noaccel);
+            case accel_mode::classic:       return visit_helper<classic>(vis, args.gain);
+            case accel_mode::jump:          return visit_helper<jump>(vis, args.gain);
+            case accel_mode::natural:       return visit_helper<natural>(vis, args.gain);
+            case accel_mode::synchronous:   return visit_helper<activation_framework>(vis, args.gain);
+            case accel_mode::power:         return visit_helper<power>(vis, args.gain);
+            case accel_mode::lookup:        return vis(lut);
+            default:                        return vis(noaccel);
             }
         }
 
diff --git a/common/common.vcxitems b/common/common.vcxitems
index b49acd2..e430bef 100644
--- a/common/common.vcxitems
+++ b/common/common.vcxitems
@@ -17,7 +17,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-classic.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-jump.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-lookup.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)accel-motivity.hpp" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)accel-synchronous.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-natural.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-noaccel.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)accel-power.hpp" />
diff --git a/common/rawaccel-base.hpp b/common/rawaccel-base.hpp
index bfb881e..0edb191 100644
--- a/common/rawaccel-base.hpp
+++ b/common/rawaccel-base.hpp
@@ -31,7 +31,7 @@ namespace rawaccel {
         classic,
         jump,
         natural,
-        motivity,
+        synchronous,
         power,
         lookup,
         noaccel
diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs
index 2f4940a..5346a9c 100644
--- a/grapher/Form1.Designer.cs
+++ b/grapher/Form1.Designer.cs
@@ -160,14 +160,14 @@ namespace grapher
             this.inCapLabelYClassic = new System.Windows.Forms.Label();
             this.constantOneLabelY = new System.Windows.Forms.Label();
             this.ByComponentXYLock = new System.Windows.Forms.CheckBox();
-            this.MidpointActiveYLabel = new System.Windows.Forms.Label();
+            this.SyncSpeedActiveYLabel = new System.Windows.Forms.Label();
             this.LimitActiveYLabel = new System.Windows.Forms.Label();
             this.InputJumpActiveYLabel = new System.Windows.Forms.Label();
             this.OutputJumpActiveYLabel = new System.Windows.Forms.Label();
             this.InputOffsetActiveYLabel = new System.Windows.Forms.Label();
             this.OutputOffsetActiveYLabel = new System.Windows.Forms.Label();
             this.AccelerationActiveLabelY = new System.Windows.Forms.Label();
-            this.MidpointActiveXLabel = new System.Windows.Forms.Label();
+            this.SyncSpeedActiveXLabel = new System.Windows.Forms.Label();
             this.LimitActiveXLabel = new System.Windows.Forms.Label();
             this.InputJumpActiveXLabel = new System.Windows.Forms.Label();
             this.OutputJumpActiveXLabel = new System.Windows.Forms.Label();
@@ -245,7 +245,7 @@ namespace grapher
             this.expBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox();
             this.expBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
             this.accelTypeDropY = new grapher.Models.Theming.Controls.ThemeableComboBox();
-            this.midpointBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox();
+            this.syncSpeedBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox();
             this.limitBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox();
             this.inputJumpBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox();
             this.outputJumpBoxY = new grapher.Models.Theming.Controls.ThemeableTextBox();
@@ -258,7 +258,7 @@ namespace grapher
             this.outputJumpBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
             this.inputOffsetBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
             this.outputOffsetBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
-            this.midpointBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
+            this.syncSpeedBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
             this.limitBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
             this.inCapBoxXClassic = new grapher.Models.Theming.Controls.ThemeableTextBox();
             this.accelerationBoxX = new grapher.Models.Theming.Controls.ThemeableTextBox();
@@ -381,7 +381,7 @@ namespace grapher
             this.optionsPanel.Controls.Add(this.inCapLabelYClassic);
             this.optionsPanel.Controls.Add(this.constantOneLabelY);
             this.optionsPanel.Controls.Add(this.ByComponentXYLock);
-            this.optionsPanel.Controls.Add(this.MidpointActiveYLabel);
+            this.optionsPanel.Controls.Add(this.SyncSpeedActiveYLabel);
             this.optionsPanel.Controls.Add(this.LimitActiveYLabel);
             this.optionsPanel.Controls.Add(this.InputJumpActiveYLabel);
             this.optionsPanel.Controls.Add(this.OutputJumpActiveYLabel);
@@ -389,14 +389,14 @@ namespace grapher
             this.optionsPanel.Controls.Add(this.OutputOffsetActiveYLabel);
             this.optionsPanel.Controls.Add(this.AccelerationActiveLabelY);
             this.optionsPanel.Controls.Add(this.accelTypeDropY);
-            this.optionsPanel.Controls.Add(this.midpointBoxY);
+            this.optionsPanel.Controls.Add(this.syncSpeedBoxY);
             this.optionsPanel.Controls.Add(this.limitBoxY);
             this.optionsPanel.Controls.Add(this.inputJumpBoxY);
             this.optionsPanel.Controls.Add(this.outputJumpBoxY);
             this.optionsPanel.Controls.Add(this.inputOffsetBoxY);
             this.optionsPanel.Controls.Add(this.outputOffsetBoxY);
             this.optionsPanel.Controls.Add(this.accelerationBoxY);
-            this.optionsPanel.Controls.Add(this.MidpointActiveXLabel);
+            this.optionsPanel.Controls.Add(this.SyncSpeedActiveXLabel);
             this.optionsPanel.Controls.Add(this.LimitActiveXLabel);
             this.optionsPanel.Controls.Add(this.InputJumpActiveXLabel);
             this.optionsPanel.Controls.Add(this.OutputJumpActiveXLabel);
@@ -425,7 +425,7 @@ namespace grapher
             this.optionsPanel.Controls.Add(this.inputOffsetBoxX);
             this.optionsPanel.Controls.Add(this.outputOffsetBoxX);
             this.optionsPanel.Controls.Add(this.constantThreeLabelX);
-            this.optionsPanel.Controls.Add(this.midpointBoxX);
+            this.optionsPanel.Controls.Add(this.syncSpeedBoxX);
             this.optionsPanel.Controls.Add(this.limitLabelX);
             this.optionsPanel.Controls.Add(this.limitBoxX);
             this.optionsPanel.Controls.Add(this.inCapLabelXClassic);
@@ -1202,7 +1202,7 @@ namespace grapher
             this.constantThreeLabelY.Name = "constantThreeLabelY";
             this.constantThreeLabelY.Size = new System.Drawing.Size(47, 13);
             this.constantThreeLabelY.TabIndex = 137;
-            this.constantThreeLabelY.Text = "Midpoint";
+            this.constantThreeLabelY.Text = "SyncSpeed";
             // 
             // limitLabelY
             // 
@@ -1278,14 +1278,14 @@ namespace grapher
             this.ByComponentXYLock.TabIndex = 20;
             this.ByComponentXYLock.UseVisualStyleBackColor = true;
             // 
-            // MidpointActiveYLabel
+            // SyncSpeedActiveYLabel
             // 
-            this.MidpointActiveYLabel.AutoSize = true;
-            this.MidpointActiveYLabel.Location = new System.Drawing.Point(414, 330);
-            this.MidpointActiveYLabel.Name = "MidpointActiveYLabel";
-            this.MidpointActiveYLabel.Size = new System.Drawing.Size(13, 13);
-            this.MidpointActiveYLabel.TabIndex = 131;
-            this.MidpointActiveYLabel.Text = "0";
+            this.SyncSpeedActiveYLabel.AutoSize = true;
+            this.SyncSpeedActiveYLabel.Location = new System.Drawing.Point(414, 330);
+            this.SyncSpeedActiveYLabel.Name = "SyncSpeedActiveYLabel";
+            this.SyncSpeedActiveYLabel.Size = new System.Drawing.Size(13, 13);
+            this.SyncSpeedActiveYLabel.TabIndex = 131;
+            this.SyncSpeedActiveYLabel.Text = "0";
             // 
             // LimitActiveYLabel
             // 
@@ -1341,14 +1341,14 @@ namespace grapher
             this.AccelerationActiveLabelY.TabIndex = 128;
             this.AccelerationActiveLabelY.Text = "0";
             // 
-            // MidpointActiveXLabel
+            // SyncSpeedActiveXLabel
             // 
-            this.MidpointActiveXLabel.AutoSize = true;
-            this.MidpointActiveXLabel.Location = new System.Drawing.Point(197, 330);
-            this.MidpointActiveXLabel.Name = "MidpointActiveXLabel";
-            this.MidpointActiveXLabel.Size = new System.Drawing.Size(13, 13);
-            this.MidpointActiveXLabel.TabIndex = 127;
-            this.MidpointActiveXLabel.Text = "0";
+            this.SyncSpeedActiveXLabel.AutoSize = true;
+            this.SyncSpeedActiveXLabel.Location = new System.Drawing.Point(197, 330);
+            this.SyncSpeedActiveXLabel.Name = "SyncSpeedActiveXLabel";
+            this.SyncSpeedActiveXLabel.Size = new System.Drawing.Size(13, 13);
+            this.SyncSpeedActiveXLabel.TabIndex = 127;
+            this.SyncSpeedActiveXLabel.Text = "0";
             // 
             // LimitActiveXLabel
             // 
@@ -1553,7 +1553,7 @@ namespace grapher
             this.constantThreeLabelX.Name = "constantThreeLabelX";
             this.constantThreeLabelX.Size = new System.Drawing.Size(47, 13);
             this.constantThreeLabelX.TabIndex = 105;
-            this.constantThreeLabelX.Text = "Midpoint";
+            this.constantThreeLabelX.Text = "SyncSpeed";
             this.constantThreeLabelX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // limitLabelX
@@ -2216,12 +2216,12 @@ namespace grapher
             this.accelTypeDropY.TabIndex = 140;
             this.accelTypeDropY.Text = "Accel Type";
             // 
-            // midpointBoxY
+            // syncSpeedBoxY
             // 
-            this.midpointBoxY.Location = new System.Drawing.Point(332, 327);
-            this.midpointBoxY.Name = "midpointBoxY";
-            this.midpointBoxY.Size = new System.Drawing.Size(76, 20);
-            this.midpointBoxY.TabIndex = 214;
+            this.syncSpeedBoxY.Location = new System.Drawing.Point(332, 327);
+            this.syncSpeedBoxY.Name = "syncSpeedBoxY";
+            this.syncSpeedBoxY.Size = new System.Drawing.Size(76, 20);
+            this.syncSpeedBoxY.TabIndex = 214;
             // 
             // limitBoxY
             // 
@@ -2307,12 +2307,12 @@ namespace grapher
             this.outputOffsetBoxX.Size = new System.Drawing.Size(76, 20);
             this.outputOffsetBoxX.TabIndex = 113;
             // 
-            // midpointBoxX
+            // syncSpeedBoxX
             // 
-            this.midpointBoxX.Location = new System.Drawing.Point(106, 327);
-            this.midpointBoxX.Name = "midpointBoxX";
-            this.midpointBoxX.Size = new System.Drawing.Size(76, 20);
-            this.midpointBoxX.TabIndex = 114;
+            this.syncSpeedBoxX.Location = new System.Drawing.Point(106, 327);
+            this.syncSpeedBoxX.Name = "syncSpeedBoxX";
+            this.syncSpeedBoxX.Size = new System.Drawing.Size(76, 20);
+            this.syncSpeedBoxX.TabIndex = 114;
             // 
             // limitBoxX
             // 
@@ -2417,7 +2417,7 @@ namespace grapher
         private System.Windows.Forms.Label inCapLabelYClassic;
         private System.Windows.Forms.Label constantOneLabelY;
         private System.Windows.Forms.CheckBox ByComponentXYLock;
-        private System.Windows.Forms.Label MidpointActiveYLabel;
+        private System.Windows.Forms.Label SyncSpeedActiveYLabel;
         private System.Windows.Forms.Label LimitActiveYLabel;
         private System.Windows.Forms.Label InputJumpActiveYLabel;
         private System.Windows.Forms.Label OutputJumpActiveYLabel;
@@ -2425,14 +2425,14 @@ namespace grapher
         private System.Windows.Forms.Label OutputOffsetActiveYLabel;
         private System.Windows.Forms.Label AccelerationActiveLabelY;
         private  grapher.Models.Theming.Controls.ThemeableComboBox accelTypeDropY;
-        private grapher.Models.Theming.Controls.ThemeableTextBox midpointBoxY;
+        private grapher.Models.Theming.Controls.ThemeableTextBox syncSpeedBoxY;
         private grapher.Models.Theming.Controls.ThemeableTextBox limitBoxY;
         private grapher.Models.Theming.Controls.ThemeableTextBox inputJumpBoxY;
         private grapher.Models.Theming.Controls.ThemeableTextBox outputJumpBoxY;
         private grapher.Models.Theming.Controls.ThemeableTextBox inputOffsetBoxY;
         private grapher.Models.Theming.Controls.ThemeableTextBox outputOffsetBoxY;
         private grapher.Models.Theming.Controls.ThemeableTextBox accelerationBoxY;
-        private System.Windows.Forms.Label MidpointActiveXLabel;
+        private System.Windows.Forms.Label SyncSpeedActiveXLabel;
         private System.Windows.Forms.Label LimitActiveXLabel;
         private System.Windows.Forms.Label InputJumpActiveXLabel;
         private System.Windows.Forms.Label OutputJumpActiveXLabel;
@@ -2461,7 +2461,7 @@ namespace grapher
         private grapher.Models.Theming.Controls.ThemeableTextBox inputJumpBoxX;
         private grapher.Models.Theming.Controls.ThemeableTextBox outputJumpBoxX;
         private System.Windows.Forms.Label constantThreeLabelX;
-        private grapher.Models.Theming.Controls.ThemeableTextBox midpointBoxX;
+        private grapher.Models.Theming.Controls.ThemeableTextBox syncSpeedBoxX;
         private System.Windows.Forms.Label limitLabelX;
         private grapher.Models.Theming.Controls.ThemeableTextBox limitBoxX;
         private System.Windows.Forms.Label inCapLabelXClassic;
diff --git a/grapher/Form1.cs b/grapher/Form1.cs
index 9734395..82a6f37 100644
--- a/grapher/Form1.cs
+++ b/grapher/Form1.cs
@@ -129,8 +129,8 @@ namespace grapher
                 powerBoxY,
                 expBoxX,
                 expBoxY,
-                midpointBoxX,
-                midpointBoxY,
+                syncSpeedBoxX,
+                syncSpeedBoxY,
                 DomainBoxX,
                 DomainBoxY,
                 RangeBoxX,
@@ -232,8 +232,8 @@ namespace grapher
                 PowerClassicActiveYLabel,
                 ExpActiveXLabel,
                 ExpActiveYLabel,
-                MidpointActiveXLabel,
-                MidpointActiveYLabel,
+                SyncSpeedActiveXLabel,
+                SyncSpeedActiveYLabel,
                 AccelTypeActiveLabelX,
                 AccelTypeActiveLabelY,
                 gainSwitchActiveLabelX,
diff --git a/grapher/Layouts/ClassicLayout.cs b/grapher/Layouts/ClassicLayout.cs
index cb09fba..40881bb 100644
--- a/grapher/Layouts/ClassicLayout.cs
+++ b/grapher/Layouts/ClassicLayout.cs
@@ -14,14 +14,14 @@ namespace grapher.Layouts
             ClassicCapLayout = new OptionLayout(true, CapType);
             PowerCapLayout = new OptionLayout(false, string.Empty);
             DecayRateLayout = new OptionLayout(false, string.Empty);
-            GrowthRateLayout = new OptionLayout(false, string.Empty);
+            GammaLayout = new OptionLayout(false, string.Empty);
             SmoothLayout = new OptionLayout(false, string.Empty);
             InputOffsetLayout = new OptionLayout(true, InputOffset);
             LimitLayout = new OptionLayout(false, string.Empty);
             PowerClassicLayout = new OptionLayout(true, PowerClassic);
             ExponentLayout = new OptionLayout(false, string.Empty);
             OutputOffsetLayout = new OptionLayout(false, string.Empty);
-            MidpointLayout = new OptionLayout(false, string.Empty);
+            SyncSpeedLayout = new OptionLayout(false, string.Empty);
             LutTextLayout = new OptionLayout(false, string.Empty);
             LutPanelLayout = new OptionLayout(false, string.Empty);
             LutApplyOptionsLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Layouts/DefaultLayout.cs b/grapher/Layouts/DefaultLayout.cs
index 357c36f..f0c7daf 100644
--- a/grapher/Layouts/DefaultLayout.cs
+++ b/grapher/Layouts/DefaultLayout.cs
@@ -15,14 +15,14 @@ namespace grapher.Layouts
             ClassicCapLayout = new OptionLayout(false, string.Empty);
             PowerCapLayout = new OptionLayout(false, string.Empty);
             DecayRateLayout = new OptionLayout(true, DecayRate);
-            GrowthRateLayout = new OptionLayout(true, GrowthRate);
+            GammaLayout = new OptionLayout(true, Gamma);
             SmoothLayout = new OptionLayout(true, Smooth);
             InputOffsetLayout = new OptionLayout(true, InputOffset);
             LimitLayout = new OptionLayout(true, Limit);
             PowerClassicLayout = new OptionLayout(true, PowerClassic);
             ExponentLayout = new OptionLayout(true, Exponent);
             OutputOffsetLayout = new OptionLayout(false, string.Empty);
-            MidpointLayout = new OptionLayout(true, Midpoint);
+            SyncSpeedLayout = new OptionLayout(true, SyncSpeed);
             LutTextLayout = new OptionLayout(false, string.Empty);
             LutPanelLayout = new OptionLayout(false, string.Empty);
             LutApplyOptionsLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Layouts/JumpLayout.cs b/grapher/Layouts/JumpLayout.cs
index 453a2c7..450a558 100644
--- a/grapher/Layouts/JumpLayout.cs
+++ b/grapher/Layouts/JumpLayout.cs
@@ -15,14 +15,14 @@ namespace grapher.Layouts
             ClassicCapLayout = new OptionLayout(false, string.Empty);
             PowerCapLayout = new OptionLayout(false, string.Empty);
             DecayRateLayout = new OptionLayout(false, string.Empty);
-            GrowthRateLayout = new OptionLayout(false, string.Empty);
+            GammaLayout = new OptionLayout(false, string.Empty);
             SmoothLayout = new OptionLayout(true, Smooth);
             InputOffsetLayout = new OptionLayout(false, InputOffset);
             LimitLayout = new OptionLayout(false, Limit);
             PowerClassicLayout = new OptionLayout(false, string.Empty);
             ExponentLayout = new OptionLayout(false, string.Empty);
             OutputOffsetLayout = new OptionLayout(false, string.Empty);
-            MidpointLayout = new OptionLayout(false, string.Empty);
+            SyncSpeedLayout = new OptionLayout(false, string.Empty);
             LutTextLayout = new OptionLayout(false, string.Empty);
             LutPanelLayout = new OptionLayout(false, string.Empty);
             LutApplyOptionsLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Layouts/LUTLayout.cs b/grapher/Layouts/LUTLayout.cs
index 8aa0dd5..54da50b 100644
--- a/grapher/Layouts/LUTLayout.cs
+++ b/grapher/Layouts/LUTLayout.cs
@@ -23,14 +23,14 @@ namespace grapher.Layouts
             ClassicCapLayout = new OptionLayout(false, string.Empty);
             PowerCapLayout = new OptionLayout(false, string.Empty);
             DecayRateLayout = new OptionLayout(false, string.Empty);
-            GrowthRateLayout = new OptionLayout(false, string.Empty);
+            GammaLayout = new OptionLayout(false, string.Empty);
             SmoothLayout = new OptionLayout(false, string.Empty);
             InputOffsetLayout = new OptionLayout(false, string.Empty);
             LimitLayout = new OptionLayout(false, string.Empty);
             PowerClassicLayout = new OptionLayout(false, string.Empty);
             OutputOffsetLayout = new OptionLayout(false, string.Empty);
             ExponentLayout = new OptionLayout(false, Exponent);
-            MidpointLayout = new OptionLayout(false, string.Empty);
+            SyncSpeedLayout = new OptionLayout(false, string.Empty);
             LutTextLayout = new OptionLayout(true, string.Empty);
             LutPanelLayout = new OptionLayout(true, string.Empty);
             LutApplyOptionsLayout = new OptionLayout(true, string.Empty);
diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs
index e53b37e..4e664ac 100644
--- a/grapher/Layouts/LayoutBase.cs
+++ b/grapher/Layouts/LayoutBase.cs
@@ -5,14 +5,14 @@ namespace grapher.Layouts
     public abstract class LayoutBase
     {
         public const string Acceleration = "Acceleration";
-        public const string GrowthRate = "Growth Rate";
+        public const string Gamma = "Gamma";
         public const string DecayRate = "Decay Rate";
         public const string Scale = "Scale";
         public const string Exponent = "Exponent";
         public const string OutputOffset = "Output Offset";
         public const string PowerClassic = "Power";
         public const string Limit = "Limit";
-        public const string Midpoint = "Midpoint";
+        public const string SyncSpeed = "SyncSpeed";
         public const string Motivity = "Motivity";
         public const string InputOffset = "Input Offset";
         public const string CapType = "Cap Type";
@@ -25,7 +25,7 @@ namespace grapher.Layouts
         public LayoutBase()
         {
             DecayRateLayout = new OptionLayout(false, string.Empty);
-            GrowthRateLayout = new OptionLayout(false, string.Empty);
+            GammaLayout = new OptionLayout(false, string.Empty);
             SmoothLayout = new OptionLayout(false, string.Empty);
             ClassicCapLayout = new OptionLayout(false, string.Empty);
             PowerCapLayout = new OptionLayout(false, string.Empty);
@@ -36,7 +36,7 @@ namespace grapher.Layouts
             ExponentLayout = new OptionLayout(false, string.Empty);
             OutputJumpLayout = new OptionLayout(false, string.Empty);
             OutputOffsetLayout = new OptionLayout(false, string.Empty);
-            MidpointLayout = new OptionLayout(false, string.Empty);
+            SyncSpeedLayout = new OptionLayout(false, string.Empty);
             LutTextLayout = new OptionLayout(false, string.Empty);
             LutPanelLayout = new OptionLayout(false, string.Empty);
             LutApplyOptionsLayout = new OptionLayout(false, string.Empty);
@@ -55,7 +55,7 @@ namespace grapher.Layouts
 
         protected OptionLayout DecayRateLayout { get; set; }
 
-        protected OptionLayout GrowthRateLayout { get; set; }
+        protected OptionLayout GammaLayout { get; set; }
 
         protected OptionLayout SmoothLayout { get; set; }
 
@@ -77,7 +77,7 @@ namespace grapher.Layouts
 
         protected OptionLayout OutputOffsetLayout { get; set; }
 
-        protected OptionLayout MidpointLayout { get; set; }
+        protected OptionLayout SyncSpeedLayout { get; set; }
 
         protected OptionLayout LutTextLayout { get; set; }
 
@@ -106,7 +106,7 @@ namespace grapher.Layouts
             IOption expOption,
             IOption outputJumpOption,
             IOption outputOffsetOption,
-            IOption midpointOption,
+            IOption syncSpeedOption,
             IOption lutTextOption,
             IOption lutPanelOption,
             IOption lutApplyOption,
@@ -120,7 +120,7 @@ namespace grapher.Layouts
                 (ClassicCapLayout, classicCapOption),
                 (PowerCapLayout, powerCapOption),
                 (DecayRateLayout, decayRateOption),
-                (GrowthRateLayout, growthRateOption),
+                (GammaLayout, growthRateOption),
                 (SmoothLayout, smoothOption),
                 (InputJumpLayout, inputJumpOption),
                 (InputOffsetLayout, inputOffsetOption),
@@ -129,7 +129,7 @@ namespace grapher.Layouts
                 (ExponentLayout, expOption),
                 (OutputJumpLayout, outputJumpOption),
                 (OutputOffsetLayout, outputOffsetOption),
-                (MidpointLayout, midpointOption),
+                (SyncSpeedLayout, syncSpeedOption),
                 (LutTextLayout, lutTextOption),
                 (LutPanelLayout, lutPanelOption),
                 (LutApplyOptionsLayout, lutApplyOption)})
@@ -166,7 +166,7 @@ namespace grapher.Layouts
             IOption expOption,
             IOption outputJumpOption,
             IOption outputOffsetOption,
-            IOption midpointOption,
+            IOption syncSpeedOption,
             IOption lutTextOption,
             IOption lutPanelOption,
             IOption lutApplyOption)
@@ -184,7 +184,7 @@ namespace grapher.Layouts
                 expOption,
                 outputJumpOption,
                 outputOffsetOption,
-                midpointOption,
+                syncSpeedOption,
                 lutTextOption,
                 lutPanelOption,
                 lutApplyOption,
diff --git a/grapher/Layouts/LinearLayout.cs b/grapher/Layouts/LinearLayout.cs
index ebace66..858de03 100644
--- a/grapher/Layouts/LinearLayout.cs
+++ b/grapher/Layouts/LinearLayout.cs
@@ -16,14 +16,14 @@ namespace grapher.Layouts
             ClassicCapLayout = new OptionLayout(true, CapType);
             PowerCapLayout = new OptionLayout(false, string.Empty);
             DecayRateLayout = new OptionLayout(false, string.Empty);
-            GrowthRateLayout = new OptionLayout(false, string.Empty);
+            GammaLayout = new OptionLayout(false, string.Empty);
             SmoothLayout = new OptionLayout(false, string.Empty);
             InputOffsetLayout = new OptionLayout(true, InputOffset);
             LimitLayout = new OptionLayout(false, string.Empty);
             PowerClassicLayout = new OptionLayout(false, string.Empty);
             OutputOffsetLayout = new OptionLayout(false, string.Empty);
             ExponentLayout = new OptionLayout(false, string.Empty);
-            MidpointLayout = new OptionLayout(false, string.Empty);
+            SyncSpeedLayout = new OptionLayout(false, string.Empty);
             LutTextLayout = new OptionLayout(false, string.Empty);
             LutPanelLayout = new OptionLayout(false, string.Empty);
             LutApplyOptionsLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Layouts/NaturalLayout.cs b/grapher/Layouts/NaturalLayout.cs
index 03f2f82..4d831e3 100644
--- a/grapher/Layouts/NaturalLayout.cs
+++ b/grapher/Layouts/NaturalLayout.cs
@@ -15,14 +15,14 @@ namespace grapher.Layouts
             ClassicCapLayout = new OptionLayout(false, string.Empty);
             PowerCapLayout = new OptionLayout(false, string.Empty);
             DecayRateLayout = new OptionLayout(true, DecayRate);
-            GrowthRateLayout = new OptionLayout(false, string.Empty);
+            GammaLayout = new OptionLayout(false, string.Empty);
             SmoothLayout = new OptionLayout(false, string.Empty);
             InputOffsetLayout = new OptionLayout(true, InputOffset);
             LimitLayout = new OptionLayout(true, Limit);
             PowerClassicLayout = new OptionLayout(false, string.Empty);
             ExponentLayout = new OptionLayout(false, string.Empty);
             OutputOffsetLayout = new OptionLayout(false, string.Empty);
-            MidpointLayout = new OptionLayout(false, string.Empty);
+            SyncSpeedLayout = new OptionLayout(false, string.Empty);
             LutTextLayout = new OptionLayout(false, string.Empty);
             LutPanelLayout = new OptionLayout(false, string.Empty);
             LutApplyOptionsLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Layouts/OffLayout.cs b/grapher/Layouts/OffLayout.cs
index 482f87a..0d4cc4e 100644
--- a/grapher/Layouts/OffLayout.cs
+++ b/grapher/Layouts/OffLayout.cs
@@ -15,14 +15,14 @@ namespace grapher.Layouts
             ClassicCapLayout = new OptionLayout(false, string.Empty);
             PowerCapLayout = new OptionLayout(false, string.Empty);
             DecayRateLayout = new OptionLayout(false, string.Empty);
-            GrowthRateLayout = new OptionLayout(false, string.Empty);
+            GammaLayout = new OptionLayout(false, string.Empty);
             SmoothLayout = new OptionLayout(false, string.Empty);
             InputOffsetLayout = new OptionLayout(false, string.Empty);
             LimitLayout = new OptionLayout(false, string.Empty);
             PowerClassicLayout = new OptionLayout(false, string.Empty);
             ExponentLayout = new OptionLayout(false, string.Empty);
             OutputOffsetLayout = new OptionLayout(false, string.Empty);
-            MidpointLayout = new OptionLayout(false, string.Empty);
+            SyncSpeedLayout = new OptionLayout(false, string.Empty);
             LutTextLayout = new OptionLayout(false, string.Empty);
             LutPanelLayout = new OptionLayout(false, string.Empty);
             LutApplyOptionsLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Layouts/PowerLayout.cs b/grapher/Layouts/PowerLayout.cs
index fb88ab0..b7d16ea 100644
--- a/grapher/Layouts/PowerLayout.cs
+++ b/grapher/Layouts/PowerLayout.cs
@@ -13,14 +13,14 @@
             ClassicCapLayout = new OptionLayout(false, string.Empty);
             PowerCapLayout = new OptionLayout(true, CapType);
             DecayRateLayout = new OptionLayout(false, string.Empty);
-            GrowthRateLayout = new OptionLayout(false, string.Empty);
+            GammaLayout = new OptionLayout(false, string.Empty);
             SmoothLayout = new OptionLayout(false, string.Empty);
             InputOffsetLayout = new OptionLayout(false, string.Empty);
             LimitLayout = new OptionLayout(false, string.Empty);
             PowerClassicLayout = new OptionLayout(false, string.Empty);
             ExponentLayout = new OptionLayout(true, Exponent);
             OutputOffsetLayout = new OptionLayout(true, OutputOffset);
-            MidpointLayout = new OptionLayout(false, string.Empty);
+            SyncSpeedLayout = new OptionLayout(false, string.Empty);
             LutTextLayout = new OptionLayout(false, string.Empty);
             LutPanelLayout = new OptionLayout(false, string.Empty);
             LutApplyOptionsLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Layouts/MotivityLayout.cs b/grapher/Layouts/SynchronousLayout.cs
similarity index 82%
rename from grapher/Layouts/MotivityLayout.cs
rename to grapher/Layouts/SynchronousLayout.cs
index d4fd99c..7b9d89c 100644
--- a/grapher/Layouts/MotivityLayout.cs
+++ b/grapher/Layouts/SynchronousLayout.cs
@@ -7,27 +7,27 @@ using System.Threading.Tasks;
 
 namespace grapher.Layouts
 {
-    public class MotivityLayout : LayoutBase
+    public class SynchronousLayout : LayoutBase
     {
-         public MotivityLayout()
+         public SynchronousLayout()
             : base()
         {
-            Name = "Motivity";
-            Mode = AccelMode.motivity;
+            Name = "Synchronous";
+            Mode = AccelMode.synchronous;
             LogarithmicCharts = true;
 
             GainSwitchOptionLayout = new OptionLayout(true, Gain);
             ClassicCapLayout = new OptionLayout(false, string.Empty);
             PowerCapLayout = new OptionLayout(false, string.Empty);
             DecayRateLayout = new OptionLayout(false, string.Empty);
-            GrowthRateLayout = new OptionLayout(true, GrowthRate);
+            GammaLayout = new OptionLayout(true, Gamma);
             SmoothLayout = new OptionLayout(false, string.Empty);
             InputOffsetLayout = new OptionLayout(false, string.Empty);
             LimitLayout = new OptionLayout(true, Motivity);
             PowerClassicLayout = new OptionLayout(false, string.Empty);
             ExponentLayout = new OptionLayout(false, string.Empty);
             OutputOffsetLayout = new OptionLayout(false, string.Empty);
-            MidpointLayout = new OptionLayout(true, Midpoint);
+            SyncSpeedLayout = new OptionLayout(true, SyncSpeed);
             LutTextLayout = new OptionLayout(false, string.Empty);
             LutPanelLayout = new OptionLayout(false, string.Empty);
             LutApplyOptionsLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Layouts/UnsupportedLayout.cs b/grapher/Layouts/UnsupportedLayout.cs
index a2d7ab5..6b738e6 100644
--- a/grapher/Layouts/UnsupportedLayout.cs
+++ b/grapher/Layouts/UnsupportedLayout.cs
@@ -20,14 +20,14 @@ namespace grapher.Layouts
             ClassicCapLayout = new OptionLayout(false, string.Empty);
             PowerCapLayout = new OptionLayout(false, string.Empty);
             DecayRateLayout = new OptionLayout(false, string.Empty);
-            GrowthRateLayout = new OptionLayout(false, string.Empty);
+            GammaLayout = new OptionLayout(false, string.Empty);
             SmoothLayout = new OptionLayout(false, string.Empty);
             InputOffsetLayout = new OptionLayout(false, string.Empty);
             LimitLayout = new OptionLayout(false, string.Empty);
             PowerClassicLayout = new OptionLayout(false, string.Empty);
             ExponentLayout = new OptionLayout(false, Exponent);
             OutputOffsetLayout = new OptionLayout(false, string.Empty);
-            MidpointLayout = new OptionLayout(false, string.Empty);
+            SyncSpeedLayout = new OptionLayout(false, string.Empty);
             LutTextLayout = new OptionLayout(true, LUTLayoutText);
             LutPanelLayout = new OptionLayout(false, string.Empty);
             LutApplyOptionsLayout = new OptionLayout(false, string.Empty);
diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs
index ba9a9ce..af50fb6 100644
--- a/grapher/Models/AccelGUIFactory.cs
+++ b/grapher/Models/AccelGUIFactory.cs
@@ -81,8 +81,8 @@ namespace grapher.Models
             ThemeableTextBox powerClassicBoxY,
             ThemeableTextBox expBoxX,
             ThemeableTextBox expBoxY,
-            ThemeableTextBox midpointBoxX,
-            ThemeableTextBox midpointBoxY,
+            ThemeableTextBox syncSpeedBoxX,
+            ThemeableTextBox syncSpeedBoxY,
             ThemeableTextBox domainBoxX,
             ThemeableTextBox domainBoxY,
             ThemeableTextBox rangeBoxX,
@@ -184,8 +184,8 @@ namespace grapher.Models
             Label powerClassicActiveLabelY,
             Label expActiveLabelX,
             Label expActiveLabelY,
-            Label midpointActiveLabelX,
-            Label midpointActiveLabelY,
+            Label syncSpeedActiveLabelX,
+            Label syncSpeedActiveLabelY,
             Label accelTypeActiveLabelX,
             Label accelTypeActiveLabelY,
             Label gainSwitchActiveLabelX,
@@ -430,16 +430,16 @@ namespace grapher.Models
                 new ActiveValueLabel(expActiveLabelY, activeValueTitleY),
                 optionSetYLeft);
 
-            var midpointX = new Option(
-                new Field(midpointBoxX, form, 0),
+            var syncSpeedX = new Option(
+                new Field(syncSpeedBoxX, form, 0),
                 constantThreeLabelX,
-                new ActiveValueLabel(midpointActiveLabelX, activeValueTitleX),
+                new ActiveValueLabel(syncSpeedActiveLabelX, activeValueTitleX),
                 0);
 
-            var midpointY = new Option(
-                new Field(midpointBoxY, form, 0),
+            var syncSpeedY = new Option(
+                new Field(syncSpeedBoxY, form, 0),
                 constantThreeLabelY,
-                new ActiveValueLabel(midpointActiveLabelY, activeValueTitleY),
+                new ActiveValueLabel(syncSpeedActiveLabelY, activeValueTitleY),
                 optionSetYLeft);
 
             var inCapXClassic = new Option(
@@ -621,7 +621,7 @@ namespace grapher.Models
                 limitX,
                 powerClassicX,
                 exponentX,
-                midpointX,
+                syncSpeedX,
                 lutTextX,
                 new LUTPanelOptions(xLutPointsBox, xLutActiveValuesBox),
                 new LutApplyOptions(
@@ -646,7 +646,7 @@ namespace grapher.Models
                 limitY,
                 powerClassicY,
                 exponentY,
-                midpointY,
+                syncSpeedY,
                 lutTextY,
                 new LUTPanelOptions(yLutPointsBox, yLutActiveValuesBox),
                 new LutApplyOptions(
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index 8959bea..624aa27 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -16,7 +16,7 @@ namespace grapher
         public static readonly LayoutBase Classic = new ClassicLayout();
         public static readonly LayoutBase Jump = new JumpLayout();
         public static readonly LayoutBase Natural = new NaturalLayout();
-        public static readonly LayoutBase Motivity = new MotivityLayout();
+        public static readonly LayoutBase Synchronous = new SynchronousLayout();
         public static readonly LayoutBase Power = new PowerLayout();
         public static readonly LayoutBase LUT = new LUTLayout();
         public static readonly LayoutBase Off = new OffLayout();
@@ -40,7 +40,7 @@ namespace grapher
             Option limit,
             Option powerClassic,
             Option exponent,
-            Option midpoint,
+            Option syncSpeed,
             TextOption lutText,
             LUTPanelOptions lutPanelOptions,
             LutApplyOptions lutApplyOptions,
@@ -56,7 +56,7 @@ namespace grapher
                     Classic,
                     Jump,
                     Natural,
-                    Motivity,
+                    Synchronous,
                     Power,
                     LUT,
                     Off
@@ -77,7 +77,7 @@ namespace grapher
             Exponent = exponent;
             OutputJump = outputJump;
             OutputOffset = outputOffset;
-            Midpoint = midpoint;
+            SyncSpeed = syncSpeed;
             WriteButton = writeButton;
             AccelTypeActiveValue = accelTypeActiveValue;
             LutText = lutText;
@@ -137,7 +137,7 @@ namespace grapher
 
         public Option Exponent { get; }
 
-        public Option Midpoint { get; }
+        public Option SyncSpeed { get; }
 
         public TextOption LutText { get; }
 
@@ -243,7 +243,7 @@ namespace grapher
             Limit.Hide();
             PowerClassic.Hide();
             Exponent.Hide();
-            Midpoint.Hide();
+            SyncSpeed.Hide();
             LutText.Hide();
             LutPanel.Hide();
             LutApply.Hide();
@@ -283,10 +283,10 @@ namespace grapher
             DecayRate.SetActiveValue(args.decayRate);
             GrowthRate.SetActiveValue(args.gamma);
             Smooth.SetActiveValue(args.smooth);
-            Limit.SetActiveValue((args.mode == AccelMode.motivity) ? args.motivity : args.limit);
+            Limit.SetActiveValue((args.mode == AccelMode.synchronous) ? args.motivity : args.limit);
             PowerClassic.SetActiveValue(args.exponentClassic);
             Exponent.SetActiveValue(args.exponentPower);
-            Midpoint.SetActiveValue(args.syncSpeed);
+            SyncSpeed.SetActiveValue(args.syncSpeed);
             LutPanel.SetActiveValues(args.data, args.length, args.mode);
             LutApply.SetActiveValue(args.gain);
         }
@@ -346,7 +346,7 @@ namespace grapher
             if (OutputJump.Visible) args.cap.y = OutputJump.Field.Data;
             if (Limit.Visible)
             {
-                if (args.mode == AccelMode.motivity)
+                if (args.mode == AccelMode.synchronous)
                 {
                     args.motivity = Limit.Field.Data;
                 }
@@ -360,7 +360,7 @@ namespace grapher
             if (InputOffset.Visible) args.inputOffset = InputOffset.Field.Data;
             if (OutputOffset.Visible) args.outputOffset = OutputOffset.Field.Data;
 
-            if (Midpoint.Visible) args.syncSpeed = Midpoint.Field.Data;
+            if (SyncSpeed.Visible) args.syncSpeed = SyncSpeed.Field.Data;
             if (LutPanel.Visible)
             {
                 (var points, var length) = LutPanel.GetPoints();
@@ -393,7 +393,7 @@ namespace grapher
             Limit.AlignActiveValues();
             PowerClassic.AlignActiveValues();
             Exponent.AlignActiveValues();
-            Midpoint.AlignActiveValues();
+            SyncSpeed.AlignActiveValues();
             LutApply.AlignActiveValues();
         }
 
@@ -433,7 +433,7 @@ namespace grapher
                 Exponent,
                 OutputJump,
                 OutputOffset,
-                Midpoint,
+                SyncSpeed,
                 LutText,
                 LutPanel,
                 LutApply,
@@ -447,7 +447,7 @@ namespace grapher
                 case AccelMode.classic:  return (args.exponentClassic == 2) ? Linear : Classic;
                 case AccelMode.jump:     return Jump;
                 case AccelMode.natural:  return Natural;
-                case AccelMode.motivity: return Motivity;
+                case AccelMode.synchronous: return Synchronous;
                 case AccelMode.power:    return Power;
                 case AccelMode.lut:      return LUT;
                 default:                 return Off;
diff --git a/grapher/grapher.csproj b/grapher/grapher.csproj
index 75fb625..ef85a20 100644
--- a/grapher/grapher.csproj
+++ b/grapher/grapher.csproj
@@ -78,12 +78,12 @@
       <DependentUpon>AboutBox.cs</DependentUpon>
     </Compile>
     <Compile Include="Common\Constants.cs" />
-	<Compile Include="Common\Helper.cs" />
+    <Compile Include="Common\Helper.cs" />
     <Compile Include="DeviceMenuForm.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Layouts\LUTLayout.cs" />
-    <Compile Include="Layouts\MotivityLayout.cs" />
+    <Compile Include="Layouts\SynchronousLayout.cs" />
     <Compile Include="Layouts\JumpLayout.cs" />
     <Compile Include="Layouts\UnsupportedLayout.cs" />
     <Compile Include="MessageDialog.cs">
diff --git a/wrapper-tests/SynchronousAccelTests.cs b/wrapper-tests/SynchronousAccelTests.cs
index 27cc7c6..f6136a8 100644
--- a/wrapper-tests/SynchronousAccelTests.cs
+++ b/wrapper-tests/SynchronousAccelTests.cs
@@ -17,7 +17,7 @@ namespace wrapper_tests
 
             var profile = new Profile();
             profile.outputDPI = 1000;
-            profile.argsX.mode = AccelMode.motivity;
+            profile.argsX.mode = AccelMode.synchronous;
             profile.argsX.gain = false;
             profile.argsX.syncSpeed = syncSpeed;
             profile.argsX.gamma = gamma;
diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp
index ecc4de3..1ba75c5 100644
--- a/wrapper/wrapper.cpp
+++ b/wrapper/wrapper.cpp
@@ -37,7 +37,7 @@ public ref struct VersionHelper
 [JsonConverter(Converters::StringEnumConverter::typeid)]
 public enum class AccelMode
 {
-    classic, jump, natural, motivity, power, lut, noaccel
+    classic, jump, natural, synchronous, power, lut, noaccel
 };
 
 [JsonConverter(Converters::StringEnumConverter::typeid)]