diff --git a/src/config.c b/src/config.c
index 647fba00ce..5a71414130 100755
--- a/src/config.c
+++ b/src/config.c
@@ -313,7 +313,7 @@ static void resetConf(void)
     masterConfig.serialConfig.reboot_character = 'R';
 
     masterConfig.looptime = 3500;
-    masterConfig.emfAvoidance = 0;
+    masterConfig.emf_avoidance = 0;
     masterConfig.rssi_aux_channel = 0;
 
     currentProfile.pidController = 0;
@@ -324,9 +324,10 @@ static void resetConf(void)
     currentProfile.controlRateConfig.rollPitchRate = 0;
     currentProfile.controlRateConfig.yawRate = 0;
     currentProfile.dynThrPID = 0;
-    currentProfile.tpaBreakPoint = 1500;
+    currentProfile.tpa_breakpoint = 1500;
     currentProfile.controlRateConfig.thrMid8 = 50;
     currentProfile.controlRateConfig.thrExpo8 = 0;
+
     // for (i = 0; i < CHECKBOXITEMS; i++)
     //     cfg.activate[i] = 0;
 
diff --git a/src/config_master.h b/src/config_master.h
index 6b82bd3ec6..03c56b315d 100644
--- a/src/config_master.h
+++ b/src/config_master.h
@@ -9,7 +9,7 @@ typedef struct master_t {
     uint8_t mixerConfiguration;
     uint32_t enabledFeatures;
     uint16_t looptime;                      // imu loop time in us
-    uint8_t emfAvoidance;                   // change pll settings to avoid noise in the uhf band
+    uint8_t emf_avoidance;                   // change pll settings to avoid noise in the uhf band
     motorMixer_t customMixer[MAX_SUPPORTED_MOTORS]; // custom mixtable
 
     // motor/esc/servo related stuff
diff --git a/src/config_profile.h b/src/config_profile.h
index f3c828c98d..2f78259d8e 100644
--- a/src/config_profile.h
+++ b/src/config_profile.h
@@ -8,7 +8,7 @@ typedef struct profile_s {
     controlRateConfig_t controlRateConfig;
 
     uint8_t dynThrPID;
-    uint16_t tpaBreakPoint;                 // Breakpoint where TPA is activated
+    uint16_t tpa_breakpoint;                 // Breakpoint where TPA is activated
     int16_t mag_declination;                // Get your magnetic decliniation from here : http://magnetic-declination.com/
     rollAndPitchTrims_t accelerometerTrims; // accelerometer trim
 
diff --git a/src/main.c b/src/main.c
index f5dd942a44..7242985370 100755
--- a/src/main.c
+++ b/src/main.c
@@ -69,7 +69,7 @@ int main(void)
     serialPort_t* loopbackPort1 = NULL;
     serialPort_t* loopbackPort2 = NULL;
 #endif
-    systemInit(masterConfig.emfAvoidance);
+    systemInit(masterConfig.emf_avoidance);
     initPrintfSupport();
 
     ensureEEPROMContainsValidData();
diff --git a/src/mw.c b/src/mw.c
index cb70f73183..240d6dbc1c 100755
--- a/src/mw.c
+++ b/src/mw.c
@@ -58,11 +58,11 @@ void annexCode(void)
     static uint8_t vbatTimer = 0;
 
     // PITCH & ROLL only dynamic PID adjustemnt,  depending on throttle value
-    if (rcData[THROTTLE] < currentProfile.tpaBreakPoint) {
+    if (rcData[THROTTLE] < currentProfile.tpa_breakpoint) {
         prop2 = 100;
     } else {
         if (rcData[THROTTLE] < 2000) {
-            prop2 = 100 - (uint16_t)currentProfile.dynThrPID * (rcData[THROTTLE] - currentProfile.tpaBreakPoint) / (2000 - currentProfile.tpaBreakPoint);
+            prop2 = 100 - (uint16_t)currentProfile.dynThrPID * (rcData[THROTTLE] - currentProfile.tpa_breakpoint) / (2000 - currentProfile.tpa_breakpoint);
         } else {
             prop2 = 100 - currentProfile.dynThrPID;
         }
diff --git a/src/serial_cli.c b/src/serial_cli.c
index a1d5d2cef8..d567195f32 100644
--- a/src/serial_cli.c
+++ b/src/serial_cli.c
@@ -123,7 +123,7 @@ typedef struct {
 
 const clivalue_t valueTable[] = {
     { "looptime", VAR_UINT16, &masterConfig.looptime, 0, 9000 },
-    { "emf_avoidance", VAR_UINT8, &masterConfig.emfAvoidance, 0, 1 },
+    { "emf_avoidance", VAR_UINT8, &masterConfig.emf_avoidance, 0, 1 },
     { "midrc", VAR_UINT16, &masterConfig.rxConfig.midrc, 1200, 1700 },
     { "minthrottle", VAR_UINT16, &masterConfig.minthrottle, PWM_RANGE_ZERO, PWM_RANGE_MAX },
     { "maxthrottle", VAR_UINT16, &masterConfig.maxthrottle, PWM_RANGE_ZERO, PWM_RANGE_MAX },
@@ -179,9 +179,9 @@ const clivalue_t valueTable[] = {
     { "thr_mid", VAR_UINT8, &currentProfile.controlRateConfig.thrMid8, 0, 100 },
     { "thr_expo", VAR_UINT8, &currentProfile.controlRateConfig.thrExpo8, 0, 100 },
     { "roll_pitch_rate", VAR_UINT8, &currentProfile.controlRateConfig.rollPitchRate, 0, 100 },
-    { "yawrate", VAR_UINT8, &currentProfile.controlRateConfig.yawRate, 0, 100 },
-    { "tparate", VAR_UINT8, &currentProfile.dynThrPID, 0, 100},
-    { "tpa_breakpoint", VAR_UINT16, &currentProfile.tpaBreakPoint, PWM_RANGE_MIN, PWM_RANGE_MAX},
+    { "yaw_rate", VAR_UINT8, &currentProfile.controlRateConfig.yawRate, 0, 100 },
+    { "tpa_rate", VAR_UINT8, &currentProfile.dynThrPID, 0, 100},
+    { "tpa_breakpoint", VAR_UINT16, &currentProfile.tpa_breakpoint, PWM_RANGE_MIN, PWM_RANGE_MAX},
     { "failsafe_delay", VAR_UINT8, &currentProfile.failsafeConfig.failsafe_delay, 0, 200 },
     { "failsafe_off_delay", VAR_UINT8, &currentProfile.failsafeConfig.failsafe_off_delay, 0, 200 },
     { "failsafe_throttle", VAR_UINT16, &currentProfile.failsafeConfig.failsafe_throttle, PWM_RANGE_MIN, PWM_RANGE_MAX },
@@ -232,7 +232,7 @@ const clivalue_t valueTable[] = {
     { "d_level", VAR_UINT8, &currentProfile.pidProfile.D8[PIDLEVEL], 0, 200 },
     { "p_vel", VAR_UINT8, &currentProfile.pidProfile.P8[PIDVEL], 0, 200 },
     { "i_vel", VAR_UINT8, &currentProfile.pidProfile.I8[PIDVEL], 0, 200 },
-    { "d_vel", VAR_UINT8, &currentProfile.pidProfile.D8[PIDVEL], 0, 200 },
+    { "d_vel", VAR_UINT8, &currentProfile.pidProfile.D8[PIDVEL], 0, 200 },
 };
 
 #define VALUE_COUNT (sizeof(valueTable) / sizeof(clivalue_t))