diff --git a/LineageActions/Android.mk b/MotoActions/Android.mk
similarity index 94%
rename from LineageActions/Android.mk
rename to MotoActions/Android.mk
index ffffd89..011c3e9 100644
--- a/LineageActions/Android.mk
+++ b/MotoActions/Android.mk
@@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := LineageActions
+LOCAL_PACKAGE_NAME := MotoActions
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_USE_AAPT2 := true
diff --git a/LineageActions/AndroidManifest.xml b/MotoActions/AndroidManifest.xml
similarity index 96%
rename from LineageActions/AndroidManifest.xml
rename to MotoActions/AndroidManifest.xml
index 037bf01..9dc63b4 100644
--- a/LineageActions/AndroidManifest.xml
+++ b/MotoActions/AndroidManifest.xml
@@ -34,7 +34,7 @@
         <activity
             android:name=".DozePreferenceActivity"
             android:label="@string/ambient_display_gestures_title"
-            android:theme="@style/LineageActions">
+            android:theme="@style/MotoActions">
             <intent-filter>
                 <action android:name="com.android.settings.action.IA_SETTINGS" />
             </intent-filter>
@@ -49,7 +49,7 @@
         <activity
             android:name=".ActionsPreferenceActivity"
             android:label="@string/moto_gestures_panel_title"
-            android:theme="@style/LineageActions">
+            android:theme="@style/MotoActions">
             <intent-filter>
                 <action android:name="com.android.settings.action.IA_SETTINGS" />
             </intent-filter>
diff --git a/LineageActions/proguard.flags b/MotoActions/proguard.flags
similarity index 80%
rename from LineageActions/proguard.flags
rename to MotoActions/proguard.flags
index ab22f4b..eba9d61 100644
--- a/LineageActions/proguard.flags
+++ b/MotoActions/proguard.flags
@@ -1,4 +1,4 @@
--keep class org.lineageos.LineageActions.* {
+-keep class org.lineageos.MotoActions.* {
   *;
 }
 
diff --git a/LineageActions/res/drawable/ic_settings_gestures.xml b/MotoActions/res/drawable/ic_settings_gestures.xml
similarity index 100%
rename from LineageActions/res/drawable/ic_settings_gestures.xml
rename to MotoActions/res/drawable/ic_settings_gestures.xml
diff --git a/LineageActions/res/values/strings.xml b/MotoActions/res/values/strings.xml
similarity index 100%
rename from LineageActions/res/values/strings.xml
rename to MotoActions/res/values/strings.xml
diff --git a/LineageActions/res/values/styles.xml b/MotoActions/res/values/styles.xml
similarity index 96%
rename from LineageActions/res/values/styles.xml
rename to MotoActions/res/values/styles.xml
index 76c7ffb..0b875b3 100644
--- a/LineageActions/res/values/styles.xml
+++ b/MotoActions/res/values/styles.xml
@@ -16,7 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <style name="LineageActions" parent="@android:style/Theme.DeviceDefault.Settings">
+    <style name="MotoActions" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="preferenceCategoryStyle">@style/SettingsTheme.PreferenceCategoryStyle</item>
         <item name="preferenceTheme">@style/SettingsTheme.Preference</item>
         <item name="switchPreferenceStyle">@style/SettingsTheme.SwitchPreferenceStyle</item>
diff --git a/LineageActions/res/xml/actions_panel.xml b/MotoActions/res/xml/actions_panel.xml
similarity index 100%
rename from LineageActions/res/xml/actions_panel.xml
rename to MotoActions/res/xml/actions_panel.xml
diff --git a/LineageActions/res/xml/doze_panel.xml b/MotoActions/res/xml/doze_panel.xml
similarity index 100%
rename from LineageActions/res/xml/doze_panel.xml
rename to MotoActions/res/xml/doze_panel.xml
diff --git a/LineageActions/src/org/lineageos/settings/device/ActionsPreferenceActivity.java b/MotoActions/src/org/lineageos/settings/device/ActionsPreferenceActivity.java
similarity index 100%
rename from LineageActions/src/org/lineageos/settings/device/ActionsPreferenceActivity.java
rename to MotoActions/src/org/lineageos/settings/device/ActionsPreferenceActivity.java
diff --git a/LineageActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java b/MotoActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java
similarity index 100%
rename from LineageActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java
rename to MotoActions/src/org/lineageos/settings/device/ActionsPreferenceFragment.java
diff --git a/LineageActions/src/org/lineageos/settings/device/BootCompletedReceiver.java b/MotoActions/src/org/lineageos/settings/device/BootCompletedReceiver.java
similarity index 97%
rename from LineageActions/src/org/lineageos/settings/device/BootCompletedReceiver.java
rename to MotoActions/src/org/lineageos/settings/device/BootCompletedReceiver.java
index 27d42d7..198bdba 100644
--- a/LineageActions/src/org/lineageos/settings/device/BootCompletedReceiver.java
+++ b/MotoActions/src/org/lineageos/settings/device/BootCompletedReceiver.java
@@ -28,7 +28,7 @@ import android.util.Log;
 import org.lineageos.settings.device.ServiceWrapper.LocalBinder;
 
 public class BootCompletedReceiver extends BroadcastReceiver {
-    static final String TAG = "LineageActions";
+    static final String TAG = "MotoActions";
     private ServiceWrapper mServiceWrapper;
 
     @Override
diff --git a/LineageActions/src/org/lineageos/settings/device/DozePreferenceActivity.java b/MotoActions/src/org/lineageos/settings/device/DozePreferenceActivity.java
similarity index 92%
rename from LineageActions/src/org/lineageos/settings/device/DozePreferenceActivity.java
rename to MotoActions/src/org/lineageos/settings/device/DozePreferenceActivity.java
index c8e7cc6..05d4576 100644
--- a/LineageActions/src/org/lineageos/settings/device/DozePreferenceActivity.java
+++ b/MotoActions/src/org/lineageos/settings/device/DozePreferenceActivity.java
@@ -38,8 +38,8 @@ public class DozePreferenceActivity extends PreferenceActivity {
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             addPreferencesFromResource(R.xml.doze_panel);
-            boolean dozeEnabled = LineageActionsSettings.isDozeEnabled(getActivity());
-            boolean aodEnabled = LineageActionsSettings.isAODEnabled(getActivity());
+            boolean dozeEnabled = MotoActionsSettings.isDozeEnabled(getActivity());
+            boolean aodEnabled = MotoActionsSettings.isAODEnabled(getActivity());
             PreferenceCategory ambientDisplayCat = (PreferenceCategory)
                     findPreference(CATEGORY_AMBIENT_DISPLAY);
             if (ambientDisplayCat != null) {
diff --git a/LineageActions/src/org/lineageos/settings/device/LineageActionsService.java b/MotoActions/src/org/lineageos/settings/device/MotoActionsService.java
similarity index 75%
rename from LineageActions/src/org/lineageos/settings/device/LineageActionsService.java
rename to MotoActions/src/org/lineageos/settings/device/MotoActionsService.java
index 0a883aa..4742701 100644
--- a/LineageActions/src/org/lineageos/settings/device/LineageActionsService.java
+++ b/MotoActions/src/org/lineageos/settings/device/MotoActionsService.java
@@ -42,9 +42,9 @@ import org.lineageos.settings.device.doze.ScreenReceiver;
 import org.lineageos.settings.device.doze.ScreenStateNotifier;
 import org.lineageos.settings.device.doze.StowSensor;
 
-public class LineageActionsService extends IntentService implements ScreenStateNotifier,
+public class MotoActionsService extends IntentService implements ScreenStateNotifier,
         UpdatedStateNotifier {
-    private static final String TAG = "LineageActions";
+    private static final String TAG = "MotoActions";
 
     private final Context mContext;
 
@@ -58,13 +58,13 @@ public class LineageActionsService extends IntentService implements ScreenStateN
     private final List<UpdatedStateNotifier> mUpdatedStateNotifiers =
                         new LinkedList<UpdatedStateNotifier>();
 
-    public LineageActionsService(Context context) {
-        super("LineageActionService");
+    public MotoActionsService(Context context) {
+        super("MotoActionservice");
         mContext = context;
 
         Log.d(TAG, "Starting");
 
-        LineageActionsSettings lineageActionsSettings = new LineageActionsSettings(context, this);
+        MotoActionsSettings MotoActionsSettings = new MotoActionsSettings(context, this);
         mSensorHelper = new SensorHelper(context);
         mScreenReceiver = new ScreenReceiver(context, this);
 
@@ -72,20 +72,20 @@ public class LineageActionsService extends IntentService implements ScreenStateN
         mScreenStateNotifiers.add(mDozePulseAction);
 
         // Actionable sensors get screen on/off notifications
-        mScreenStateNotifiers.add(new GlanceSensor(lineageActionsSettings, mSensorHelper, mDozePulseAction));
-        mScreenStateNotifiers.add(new ProximitySensor(lineageActionsSettings, mSensorHelper, mDozePulseAction));
-        mScreenStateNotifiers.add(new StowSensor(lineageActionsSettings, mSensorHelper, mDozePulseAction));
-        mScreenStateNotifiers.add(new FlatUpSensor(lineageActionsSettings, mSensorHelper, mDozePulseAction));
+        mScreenStateNotifiers.add(new GlanceSensor(MotoActionsSettings, mSensorHelper, mDozePulseAction));
+        mScreenStateNotifiers.add(new ProximitySensor(MotoActionsSettings, mSensorHelper, mDozePulseAction));
+        mScreenStateNotifiers.add(new StowSensor(MotoActionsSettings, mSensorHelper, mDozePulseAction));
+        mScreenStateNotifiers.add(new FlatUpSensor(MotoActionsSettings, mSensorHelper, mDozePulseAction));
 
         // Other actions that are always enabled
-        mUpdatedStateNotifiers.add(new CameraActivationSensor(lineageActionsSettings, mSensorHelper));
-        mUpdatedStateNotifiers.add(new ChopChopSensor(lineageActionsSettings, mSensorHelper));
-        mUpdatedStateNotifiers.add(new ProximitySilencer(lineageActionsSettings, context, mSensorHelper));
-        mUpdatedStateNotifiers.add(new FlipToMute(lineageActionsSettings, context, mSensorHelper));
-        mUpdatedStateNotifiers.add(new LiftToSilence(lineageActionsSettings, context, mSensorHelper));
+        mUpdatedStateNotifiers.add(new CameraActivationSensor(MotoActionsSettings, mSensorHelper));
+        mUpdatedStateNotifiers.add(new ChopChopSensor(MotoActionsSettings, mSensorHelper));
+        mUpdatedStateNotifiers.add(new ProximitySilencer(MotoActionsSettings, context, mSensorHelper));
+        mUpdatedStateNotifiers.add(new FlipToMute(MotoActionsSettings, context, mSensorHelper));
+        mUpdatedStateNotifiers.add(new LiftToSilence(MotoActionsSettings, context, mSensorHelper));
 
         mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-        mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "LineageActionsWakeLock");
+        mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MotoActionsWakeLock");
         updateState();
     }
 
diff --git a/LineageActions/src/org/lineageos/settings/device/LineageActionsSettings.java b/MotoActions/src/org/lineageos/settings/device/MotoActionsSettings.java
similarity index 96%
rename from LineageActions/src/org/lineageos/settings/device/LineageActionsSettings.java
rename to MotoActions/src/org/lineageos/settings/device/MotoActionsSettings.java
index c0a408c..b6b3a4e 100644
--- a/LineageActions/src/org/lineageos/settings/device/LineageActionsSettings.java
+++ b/MotoActions/src/org/lineageos/settings/device/MotoActionsSettings.java
@@ -27,8 +27,8 @@ import org.lineageos.settings.device.actions.UpdatedStateNotifier;
 import org.lineageos.settings.device.actions.CameraActivationAction;
 import org.lineageos.settings.device.actions.TorchAction;
 
-public class LineageActionsSettings {
-    private static final String TAG = "LineageActions";
+public class MotoActionsSettings {
+    private static final String TAG = "MotoActions";
 
     private static final String GESTURE_CAMERA_ACTION_KEY = "gesture_camera_action";
     private static final String GESTURE_CHOP_CHOP_KEY = "gesture_chop_chop";
@@ -49,7 +49,7 @@ public class LineageActionsSettings {
     private boolean mFlipToMuteEnabled;
     private boolean mLiftToSilenceEnabled;
 
-    public LineageActionsSettings(Context context, UpdatedStateNotifier updatedStateNotifier) {
+    public MotoActionsSettings(Context context, UpdatedStateNotifier updatedStateNotifier) {
         SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
         loadPreferences(sharedPrefs);
         sharedPrefs.registerOnSharedPreferenceChangeListener(mPrefListener);
diff --git a/LineageActions/src/org/lineageos/settings/device/SensorAction.java b/MotoActions/src/org/lineageos/settings/device/SensorAction.java
similarity index 100%
rename from LineageActions/src/org/lineageos/settings/device/SensorAction.java
rename to MotoActions/src/org/lineageos/settings/device/SensorAction.java
diff --git a/LineageActions/src/org/lineageos/settings/device/SensorHelper.java b/MotoActions/src/org/lineageos/settings/device/SensorHelper.java
similarity index 98%
rename from LineageActions/src/org/lineageos/settings/device/SensorHelper.java
rename to MotoActions/src/org/lineageos/settings/device/SensorHelper.java
index 5d3776c..6cb3647 100644
--- a/LineageActions/src/org/lineageos/settings/device/SensorHelper.java
+++ b/MotoActions/src/org/lineageos/settings/device/SensorHelper.java
@@ -30,7 +30,7 @@ import android.hardware.TriggerEventListener;
 import android.util.Log;
 
 public class SensorHelper {
-    private static final String TAG = "LineageActions";
+    private static final String TAG = "MotoActions";
 
     private static final int SENSOR_TYPE_MMI_CAMERA_ACTIVATION = 65540;
     private static final int SENSOR_TYPE_MMI_CHOP_CHOP = 65546;
diff --git a/LineageActions/src/org/lineageos/settings/device/ServiceWrapper.java b/MotoActions/src/org/lineageos/settings/device/ServiceWrapper.java
similarity index 89%
rename from LineageActions/src/org/lineageos/settings/device/ServiceWrapper.java
rename to MotoActions/src/org/lineageos/settings/device/ServiceWrapper.java
index de3609a..6deb8bf 100644
--- a/LineageActions/src/org/lineageos/settings/device/ServiceWrapper.java
+++ b/MotoActions/src/org/lineageos/settings/device/ServiceWrapper.java
@@ -24,10 +24,10 @@ import android.os.IBinder;
 import android.util.Log;
 
 public class ServiceWrapper extends android.app.Service {
-    static final String TAG = "LineageActions-ServiceWrapper";
+    static final String TAG = "MotoActions-ServiceWrapper";
 
     private final IBinder mBinder = new LocalBinder();
-    private LineageActionsService mLineageActionsService;
+    private MotoActionsService mMotoActionsService;
 
     public interface ServiceCallback {
         void sendResults(int resultCode, Bundle b);
@@ -45,7 +45,7 @@ public class ServiceWrapper extends android.app.Service {
     public void onCreate() {
         Log.i(TAG, "onCreate");
         super.onCreate();
-        mLineageActionsService = new LineageActionsService(this);
+        mMotoActionsService = new MotoActionsService(this);
     }
 
     @Override
diff --git a/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java b/MotoActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java
similarity index 98%
rename from LineageActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java
rename to MotoActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java
index 3d58992..3bd276c 100644
--- a/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java
+++ b/MotoActions/src/org/lineageos/settings/device/actions/CameraActivationAction.java
@@ -35,7 +35,7 @@ import android.util.Log;
 import org.lineageos.settings.device.SensorAction;
 
 public class CameraActivationAction implements SensorAction {
-    private static final String TAG = "LineageActions";
+    private static final String TAG = "MotoActions";
 
     private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500;
 
diff --git a/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java b/MotoActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java
similarity index 75%
rename from LineageActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java
rename to MotoActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java
index c83eb6c..4c0199a 100644
--- a/LineageActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java
+++ b/MotoActions/src/org/lineageos/settings/device/actions/CameraActivationSensor.java
@@ -25,23 +25,23 @@ import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.util.Log;
 
-import org.lineageos.settings.device.LineageActionsSettings;
+import org.lineageos.settings.device.MotoActionsSettings;
 import org.lineageos.settings.device.SensorHelper;
 
 public class CameraActivationSensor implements SensorEventListener, UpdatedStateNotifier {
-    private static final String TAG = "LineageActions-CameraSensor";
+    private static final String TAG = "MotoActions-CameraSensor";
 
     private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500;
 
-    private final LineageActionsSettings mLineageActionsSettings;
+    private final MotoActionsSettings mMotoActionsSettings;
     private final SensorHelper mSensorHelper;
 
     private final Sensor mSensor;
 
     private boolean mIsEnabled;
 
-    public CameraActivationSensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper) {
-        mLineageActionsSettings = lineageActionsSettings;
+    public CameraActivationSensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper) {
+        mMotoActionsSettings = MotoActionsSettings;
         mSensorHelper = sensorHelper;
         mSensor = sensorHelper.getCameraActivationSensor();
         mSensorHelper.registerListener(mSensor, this);
@@ -49,10 +49,10 @@ public class CameraActivationSensor implements SensorEventListener, UpdatedState
 
     @Override
     public synchronized void updateState() {
-        if (mLineageActionsSettings.isCameraGestureEnabled() && !mIsEnabled) {
+        if (mMotoActionsSettings.isCameraGestureEnabled() && !mIsEnabled) {
             Log.d(TAG, "Enabling");
             mIsEnabled = true;
-        } else if (! mLineageActionsSettings.isCameraGestureEnabled() && mIsEnabled) {
+        } else if (! mMotoActionsSettings.isCameraGestureEnabled() && mIsEnabled) {
             Log.d(TAG, "Disabling");
             mIsEnabled = false;
         }
@@ -61,7 +61,7 @@ public class CameraActivationSensor implements SensorEventListener, UpdatedState
     @Override
     public void onSensorChanged(SensorEvent event) {
         Log.d(TAG, "activate camera");
-        if (mIsEnabled) mLineageActionsSettings.cameraAction();
+        if (mIsEnabled) mMotoActionsSettings.cameraAction();
     }
 
     @Override
diff --git a/LineageActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java b/MotoActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java
similarity index 81%
rename from LineageActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java
rename to MotoActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java
index 0ccd641..e67eeda 100644
--- a/LineageActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java
+++ b/MotoActions/src/org/lineageos/settings/device/actions/ChopChopSensor.java
@@ -25,15 +25,15 @@ import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.util.Log;
 
-import org.lineageos.settings.device.LineageActionsSettings;
+import org.lineageos.settings.device.MotoActionsSettings;
 import org.lineageos.settings.device.SensorHelper;
 
 public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier {
-    private static final String TAG = "LineageActions-ChopChopSensor";
+    private static final String TAG = "MotoActions-ChopChopSensor";
 
     private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500;
 
-    private final LineageActionsSettings mLineageActionsSettings;
+    private final MotoActionsSettings mMotoActionsSettings;
     private final SensorHelper mSensorHelper;
     private final Sensor mSensor;
     private final Sensor mProx;
@@ -41,8 +41,8 @@ public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier
     private boolean mIsEnabled;
     private boolean mProxIsCovered;
 
-    public ChopChopSensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper) {
-        mLineageActionsSettings = lineageActionsSettings;
+    public ChopChopSensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper) {
+        mMotoActionsSettings = MotoActionsSettings;
         mSensorHelper = sensorHelper;
         mSensor = sensorHelper.getChopChopSensor();
         mProx = sensorHelper.getProximitySensor();
@@ -50,12 +50,12 @@ public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier
 
     @Override
     public synchronized void updateState() {
-        if (mLineageActionsSettings.isChopChopGestureEnabled() && !mIsEnabled) {
+        if (mMotoActionsSettings.isChopChopGestureEnabled() && !mIsEnabled) {
             Log.d(TAG, "Enabling");
             mSensorHelper.registerListener(mSensor, this);
             mSensorHelper.registerListener(mProx, mProxListener);
             mIsEnabled = true;
-        } else if (! mLineageActionsSettings.isChopChopGestureEnabled() && mIsEnabled) {
+        } else if (! mMotoActionsSettings.isChopChopGestureEnabled() && mIsEnabled) {
             Log.d(TAG, "Disabling");
             mSensorHelper.unregisterListener(this);
             mSensorHelper.unregisterListener(mProxListener);
@@ -70,7 +70,7 @@ public class ChopChopSensor implements SensorEventListener, UpdatedStateNotifier
             Log.d(TAG, "proximity sensor covered, ignoring chop-chop");
             return;
         }
-        mLineageActionsSettings.chopChopAction();
+        mMotoActionsSettings.chopChopAction();
     }
 
     @Override
diff --git a/LineageActions/src/org/lineageos/settings/device/actions/FlipToMute.java b/MotoActions/src/org/lineageos/settings/device/actions/FlipToMute.java
similarity index 89%
rename from LineageActions/src/org/lineageos/settings/device/actions/FlipToMute.java
rename to MotoActions/src/org/lineageos/settings/device/actions/FlipToMute.java
index 7db8154..3cfd994 100644
--- a/LineageActions/src/org/lineageos/settings/device/actions/FlipToMute.java
+++ b/MotoActions/src/org/lineageos/settings/device/actions/FlipToMute.java
@@ -27,14 +27,14 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.util.Log;
 
-import org.lineageos.settings.device.LineageActionsSettings;
+import org.lineageos.settings.device.MotoActionsSettings;
 import org.lineageos.settings.device.SensorHelper;
 
 public class FlipToMute implements UpdatedStateNotifier {
-    private static final String TAG = "LineageActions-FlipToMute";
+    private static final String TAG = "MotoActions-FlipToMute";
 
     private final NotificationManager mNotificationManager;
-    private final LineageActionsSettings mLineageActionsSettings;
+    private final MotoActionsSettings mMotoActionsSettings;
     private final SensorHelper mSensorHelper;
     private final Sensor mFlatDown;
     private final Sensor mStow;
@@ -46,9 +46,9 @@ public class FlipToMute implements UpdatedStateNotifier {
     private Context mContext;
     private Receiver mReceiver;
 
-    public FlipToMute(LineageActionsSettings lineageActionsSettings, Context context,
+    public FlipToMute(MotoActionsSettings MotoActionsSettings, Context context,
                 SensorHelper sensorHelper) {
-        mLineageActionsSettings = lineageActionsSettings;
+        mMotoActionsSettings = MotoActionsSettings;
         mContext = context;
         mSensorHelper = sensorHelper;
         mFlatDown = sensorHelper.getFlatDownSensor();
@@ -61,14 +61,14 @@ public class FlipToMute implements UpdatedStateNotifier {
 
     @Override
     public void updateState() {
-        if (mLineageActionsSettings.isFlipToMuteEnabled() && !mIsEnabled) {
+        if (mMotoActionsSettings.isFlipToMuteEnabled() && !mIsEnabled) {
             Log.d(TAG, "Enabling");
             mSensorHelper.registerListener(mFlatDown, mFlatDownListener);
             mSensorHelper.registerListener(mStow, mStowListener);
             mContext.registerReceiver(mReceiver,
                 new IntentFilter(NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED));
             mIsEnabled = true;
-        } else if (!mLineageActionsSettings.isFlipToMuteEnabled() && mIsEnabled) {
+        } else if (!mMotoActionsSettings.isFlipToMuteEnabled() && mIsEnabled) {
             Log.d(TAG, "Disabling");
             mSensorHelper.unregisterListener(mFlatDownListener);
             mSensorHelper.unregisterListener(mStowListener);
diff --git a/LineageActions/src/org/lineageos/settings/device/actions/LiftToSilence.java b/MotoActions/src/org/lineageos/settings/device/actions/LiftToSilence.java
similarity index 89%
rename from LineageActions/src/org/lineageos/settings/device/actions/LiftToSilence.java
rename to MotoActions/src/org/lineageos/settings/device/actions/LiftToSilence.java
index 4fe671f..5175489 100644
--- a/LineageActions/src/org/lineageos/settings/device/actions/LiftToSilence.java
+++ b/MotoActions/src/org/lineageos/settings/device/actions/LiftToSilence.java
@@ -26,13 +26,13 @@ import android.telecom.TelecomManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
-import org.lineageos.settings.device.LineageActionsSettings;
+import org.lineageos.settings.device.MotoActionsSettings;
 import org.lineageos.settings.device.SensorHelper;
 
 public class LiftToSilence extends PhoneStateListener implements SensorEventListener, UpdatedStateNotifier {
-    private static final String TAG = "LineageActions-LiftToSilence";
+    private static final String TAG = "MotoActions-LiftToSilence";
 
-    private final LineageActionsSettings mLineageActionsSettings;
+    private final MotoActionsSettings mMotoActionsSettings;
     private final SensorHelper mSensorHelper;
     private final Sensor mFlatUpSensor;
     private final Sensor mStowSensor;
@@ -44,9 +44,9 @@ public class LiftToSilence extends PhoneStateListener implements SensorEventList
     private boolean mIsStowed;
     private boolean mLastFlatUp;
 
-    public LiftToSilence(LineageActionsSettings lineageActionsSettings, Context context,
+    public LiftToSilence(MotoActionsSettings MotoActionsSettings, Context context,
                 SensorHelper sensorHelper) {
-        mLineageActionsSettings = lineageActionsSettings;
+        mMotoActionsSettings = MotoActionsSettings;
         mSensorHelper = sensorHelper;
         mFlatUpSensor = sensorHelper.getFlatUpSensor();
         mStowSensor = sensorHelper.getStowSensor();
@@ -56,7 +56,7 @@ public class LiftToSilence extends PhoneStateListener implements SensorEventList
 
     @Override
     public void updateState() {
-        if (mLineageActionsSettings.isLiftToSilenceEnabled()) {
+        if (mMotoActionsSettings.isLiftToSilenceEnabled()) {
             mTelephonyManager.listen(this, LISTEN_CALL_STATE);
         } else {
             mTelephonyManager.listen(this, 0);
diff --git a/LineageActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java b/MotoActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java
similarity index 90%
rename from LineageActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java
rename to MotoActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java
index 605aaf5..d97016e 100644
--- a/LineageActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java
+++ b/MotoActions/src/org/lineageos/settings/device/actions/ProximitySilencer.java
@@ -26,31 +26,31 @@ import android.telecom.TelecomManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
-import org.lineageos.settings.device.LineageActionsSettings;
+import org.lineageos.settings.device.MotoActionsSettings;
 import org.lineageos.settings.device.SensorHelper;
 
 import static android.telephony.TelephonyManager.*;
 
 public class ProximitySilencer extends PhoneStateListener implements SensorEventListener, UpdatedStateNotifier {
-    private static final String TAG = "LineageActions-ProximitySilencer";
+    private static final String TAG = "MotoActions-ProximitySilencer";
 
     private static final int SILENCE_DELAY_MS = 500;
 
     private final TelecomManager mTelecomManager;
     private final TelephonyManager mTelephonyManager;
-    private final LineageActionsSettings mLineageActionsSettings;
+    private final MotoActionsSettings mMotoActionsSettings;
     private final SensorHelper mSensorHelper;
     private final Sensor mSensor;
     private boolean mIsRinging;
     private long mRingStartedMs;
     private boolean mCoveredRinging;
 
-    public ProximitySilencer(LineageActionsSettings lineageActionsSettings, Context context,
+    public ProximitySilencer(MotoActionsSettings MotoActionsSettings, Context context,
                 SensorHelper sensorHelper) {
         mTelecomManager = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
         mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
 
-        mLineageActionsSettings = lineageActionsSettings;
+        mMotoActionsSettings = MotoActionsSettings;
         mSensorHelper = sensorHelper;
         mSensor = sensorHelper.getProximitySensor();
         mCoveredRinging = false;
@@ -59,7 +59,7 @@ public class ProximitySilencer extends PhoneStateListener implements SensorEvent
 
     @Override
     public void updateState() {
-        if (mLineageActionsSettings.isIrSilencerEnabled()) {
+        if (mMotoActionsSettings.isIrSilencerEnabled()) {
             mTelephonyManager.listen(this, LISTEN_CALL_STATE);
         } else {
             mTelephonyManager.listen(this, 0);
diff --git a/LineageActions/src/org/lineageos/settings/device/actions/TorchAction.java b/MotoActions/src/org/lineageos/settings/device/actions/TorchAction.java
similarity index 98%
rename from LineageActions/src/org/lineageos/settings/device/actions/TorchAction.java
rename to MotoActions/src/org/lineageos/settings/device/actions/TorchAction.java
index 22ff1f5..824d5d3 100644
--- a/LineageActions/src/org/lineageos/settings/device/actions/TorchAction.java
+++ b/MotoActions/src/org/lineageos/settings/device/actions/TorchAction.java
@@ -27,7 +27,7 @@ import android.util.Log;
 import org.lineageos.settings.device.SensorAction;
 
 public class TorchAction implements SensorAction {
-    private static final String TAG = "LineageActions";
+    private static final String TAG = "MotoActions";
 
     private static final int TURN_SCREEN_ON_WAKE_LOCK_MS = 500;
 
diff --git a/LineageActions/src/org/lineageos/settings/device/actions/UpdatedStateNotifier.java b/MotoActions/src/org/lineageos/settings/device/actions/UpdatedStateNotifier.java
similarity index 100%
rename from LineageActions/src/org/lineageos/settings/device/actions/UpdatedStateNotifier.java
rename to MotoActions/src/org/lineageos/settings/device/actions/UpdatedStateNotifier.java
diff --git a/LineageActions/src/org/lineageos/settings/device/doze/DozePulseAction.java b/MotoActions/src/org/lineageos/settings/device/doze/DozePulseAction.java
similarity index 97%
rename from LineageActions/src/org/lineageos/settings/device/doze/DozePulseAction.java
rename to MotoActions/src/org/lineageos/settings/device/doze/DozePulseAction.java
index 4445b28..7c48311 100644
--- a/LineageActions/src/org/lineageos/settings/device/doze/DozePulseAction.java
+++ b/MotoActions/src/org/lineageos/settings/device/doze/DozePulseAction.java
@@ -24,7 +24,7 @@ import android.util.Log;
 import org.lineageos.settings.device.SensorAction;
 
 public class DozePulseAction implements SensorAction, ScreenStateNotifier {
-    private static final String TAG = "LineageActions";
+    private static final String TAG = "MotoActions";
 
     private static final int DELAY_BETWEEN_DOZES_IN_MS = 1500;
 
diff --git a/LineageActions/src/org/lineageos/settings/device/doze/FlatUpSensor.java b/MotoActions/src/org/lineageos/settings/device/doze/FlatUpSensor.java
similarity index 87%
rename from LineageActions/src/org/lineageos/settings/device/doze/FlatUpSensor.java
rename to MotoActions/src/org/lineageos/settings/device/doze/FlatUpSensor.java
index 24255c3..2a50cc3 100644
--- a/LineageActions/src/org/lineageos/settings/device/doze/FlatUpSensor.java
+++ b/MotoActions/src/org/lineageos/settings/device/doze/FlatUpSensor.java
@@ -22,14 +22,14 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.util.Log;
 
-import org.lineageos.settings.device.LineageActionsSettings;
+import org.lineageos.settings.device.MotoActionsSettings;
 import org.lineageos.settings.device.SensorAction;
 import org.lineageos.settings.device.SensorHelper;
 
 public class FlatUpSensor implements ScreenStateNotifier {
-    private static final String TAG = "LineageActions-FlatUpSensor";
+    private static final String TAG = "MotoActions-FlatUpSensor";
 
-    private final LineageActionsSettings mLineageActionsSettings;
+    private final MotoActionsSettings mMotoActionsSettings;
     private final SensorHelper mSensorHelper;
     private final SensorAction mSensorAction;
     private final Sensor mFlatUpSensor;
@@ -39,9 +39,9 @@ public class FlatUpSensor implements ScreenStateNotifier {
     private boolean mIsStowed;
     private boolean mLastFlatUp;
 
-    public FlatUpSensor(LineageActionsSettings LineageActionsSettings, SensorHelper sensorHelper,
+    public FlatUpSensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper,
                 SensorAction action) {
-        mLineageActionsSettings = LineageActionsSettings;
+        mMotoActionsSettings = MotoActionsSettings;
         mSensorHelper = sensorHelper;
         mSensorAction = action;
 
@@ -61,7 +61,7 @@ public class FlatUpSensor implements ScreenStateNotifier {
 
     @Override
     public void screenTurnedOff() {
-        if (mLineageActionsSettings.isPickUpEnabled() && !mEnabled) {
+        if (mMotoActionsSettings.isPickUpEnabled() && !mEnabled) {
             Log.d(TAG, "Enabling");
             mSensorHelper.registerListener(mFlatUpSensor, mFlatUpListener);
             mSensorHelper.registerListener(mStowSensor, mStowListener);
diff --git a/LineageActions/src/org/lineageos/settings/device/doze/GlanceSensor.java b/MotoActions/src/org/lineageos/settings/device/doze/GlanceSensor.java
similarity index 86%
rename from LineageActions/src/org/lineageos/settings/device/doze/GlanceSensor.java
rename to MotoActions/src/org/lineageos/settings/device/doze/GlanceSensor.java
index b557449..9607cfc 100644
--- a/LineageActions/src/org/lineageos/settings/device/doze/GlanceSensor.java
+++ b/MotoActions/src/org/lineageos/settings/device/doze/GlanceSensor.java
@@ -21,14 +21,14 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.util.Log;
 
-import org.lineageos.settings.device.LineageActionsSettings;
+import org.lineageos.settings.device.MotoActionsSettings;
 import org.lineageos.settings.device.SensorAction;
 import org.lineageos.settings.device.SensorHelper;
 
 public class GlanceSensor implements ScreenStateNotifier {
-    private static final String TAG = "LineageActions-GlanceSensor";
+    private static final String TAG = "MotoActions-GlanceSensor";
 
-    private final LineageActionsSettings mLineageActionsSettings;
+    private final MotoActionsSettings mMotoActionsSettings;
     private final SensorHelper mSensorHelper;
     private final SensorAction mSensorAction;
     
@@ -37,9 +37,9 @@ public class GlanceSensor implements ScreenStateNotifier {
 
     private boolean mEnabled;
 
-    public GlanceSensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper,
+    public GlanceSensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper,
                 SensorAction action) {
-        mLineageActionsSettings = lineageActionsSettings;
+        mMotoActionsSettings = MotoActionsSettings;
         mSensorHelper = sensorHelper;
         mSensorAction = action;
 
@@ -59,7 +59,7 @@ public class GlanceSensor implements ScreenStateNotifier {
 
     @Override
     public void screenTurnedOff() {
-        if (mLineageActionsSettings.isPickUpEnabled() && !mEnabled) {
+        if (mMotoActionsSettings.isPickUpEnabled() && !mEnabled) {
             Log.d(TAG, "Enabling");
             mSensorHelper.registerListener(mSensor, mGlanceListener);
             mSensorHelper.registerListener(mSensor, mApproachGlanceListener);
diff --git a/LineageActions/src/org/lineageos/settings/device/doze/ProximitySensor.java b/MotoActions/src/org/lineageos/settings/device/doze/ProximitySensor.java
similarity index 83%
rename from LineageActions/src/org/lineageos/settings/device/doze/ProximitySensor.java
rename to MotoActions/src/org/lineageos/settings/device/doze/ProximitySensor.java
index dca3c41..5ba148c 100644
--- a/LineageActions/src/org/lineageos/settings/device/doze/ProximitySensor.java
+++ b/MotoActions/src/org/lineageos/settings/device/doze/ProximitySensor.java
@@ -22,14 +22,14 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.util.Log;
 
-import org.lineageos.settings.device.LineageActionsSettings;
+import org.lineageos.settings.device.MotoActionsSettings;
 import org.lineageos.settings.device.SensorAction;
 import org.lineageos.settings.device.SensorHelper;
 
 public class ProximitySensor implements ScreenStateNotifier, SensorEventListener {
-    private static final String TAG = "LineageActions-ProximitySensor";
+    private static final String TAG = "MotoActions-ProximitySensor";
 
-    private final LineageActionsSettings mLineageActionsSettings;
+    private final MotoActionsSettings mMotoActionsSettings;
     private final SensorHelper mSensorHelper;
     private final SensorAction mSensorAction;
     private final Sensor mSensor;
@@ -38,9 +38,9 @@ public class ProximitySensor implements ScreenStateNotifier, SensorEventListener
 
     private boolean mSawNear = false;
 
-    public ProximitySensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper,
+    public ProximitySensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper,
                 SensorAction action) {
-        mLineageActionsSettings = lineageActionsSettings;
+        mMotoActionsSettings = MotoActionsSettings;
         mSensorHelper = sensorHelper;
         mSensorAction = action;
 
@@ -58,7 +58,7 @@ public class ProximitySensor implements ScreenStateNotifier, SensorEventListener
 
     @Override
     public void screenTurnedOff() {
-        if (mLineageActionsSettings.isIrWakeupEnabled() && !mEnabled) {
+        if (mMotoActionsSettings.isIrWakeupEnabled() && !mEnabled) {
             Log.d(TAG, "Enabling");
             mSensorHelper.registerListener(mSensor, this);
             mEnabled = true;
diff --git a/LineageActions/src/org/lineageos/settings/device/doze/ScreenReceiver.java b/MotoActions/src/org/lineageos/settings/device/doze/ScreenReceiver.java
similarity index 100%
rename from LineageActions/src/org/lineageos/settings/device/doze/ScreenReceiver.java
rename to MotoActions/src/org/lineageos/settings/device/doze/ScreenReceiver.java
diff --git a/LineageActions/src/org/lineageos/settings/device/doze/ScreenStateNotifier.java b/MotoActions/src/org/lineageos/settings/device/doze/ScreenStateNotifier.java
similarity index 100%
rename from LineageActions/src/org/lineageos/settings/device/doze/ScreenStateNotifier.java
rename to MotoActions/src/org/lineageos/settings/device/doze/ScreenStateNotifier.java
diff --git a/LineageActions/src/org/lineageos/settings/device/doze/StowSensor.java b/MotoActions/src/org/lineageos/settings/device/doze/StowSensor.java
similarity index 84%
rename from LineageActions/src/org/lineageos/settings/device/doze/StowSensor.java
rename to MotoActions/src/org/lineageos/settings/device/doze/StowSensor.java
index 74c22fe..8631261 100644
--- a/LineageActions/src/org/lineageos/settings/device/doze/StowSensor.java
+++ b/MotoActions/src/org/lineageos/settings/device/doze/StowSensor.java
@@ -24,15 +24,15 @@ import android.util.Log;
 
 import java.lang.System;
 
-import org.lineageos.settings.device.LineageActionsSettings;
+import org.lineageos.settings.device.MotoActionsSettings;
 import org.lineageos.settings.device.SensorAction;
 import org.lineageos.settings.device.SensorHelper;
 
 public class StowSensor implements ScreenStateNotifier, SensorEventListener {
-    private static final String TAG = "LineageActions-StowSensor";
+    private static final String TAG = "MotoActions-StowSensor";
     private static final int IN_POCKET_MIN_TIME = 5000;
 
-    private final LineageActionsSettings mLineageActionsSettings;
+    private final MotoActionsSettings mMotoActionsSettings;
     private final SensorHelper mSensorHelper;
     private final SensorAction mSensorAction;
     private final Sensor mSensor;
@@ -41,9 +41,9 @@ public class StowSensor implements ScreenStateNotifier, SensorEventListener {
     private boolean mLastStowed;
     private long isStowedTime;
 
-    public StowSensor(LineageActionsSettings lineageActionsSettings, SensorHelper sensorHelper,
+    public StowSensor(MotoActionsSettings MotoActionsSettings, SensorHelper sensorHelper,
                 SensorAction action) {
-        mLineageActionsSettings = lineageActionsSettings;
+        mMotoActionsSettings = MotoActionsSettings;
         mSensorHelper = sensorHelper;
         mSensorAction = action;
 
@@ -61,8 +61,8 @@ public class StowSensor implements ScreenStateNotifier, SensorEventListener {
 
     @Override
     public void screenTurnedOff() {
-        if (!mLineageActionsSettings.isIrWakeupEnabled() &&
-            mLineageActionsSettings.isPickUpEnabled() && !mEnabled) {
+        if (!mMotoActionsSettings.isIrWakeupEnabled() &&
+            mMotoActionsSettings.isPickUpEnabled() && !mEnabled) {
             Log.d(TAG, "Enabling");
             mSensorHelper.registerListener(mSensor, this);
             mEnabled = true;