FaceDetect -> FaceUnlock
diff --git a/FrameworkOverlay/AndroidManifest.xml b/FrameworkOverlay/AndroidManifest.xml
index 7e6f411..7d85c5c 100644
--- a/FrameworkOverlay/AndroidManifest.xml
+++ b/FrameworkOverlay/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!--suppress ALL -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.libremobileos.facedetect.android.overlay">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.libremobileos.faceunlock.android.overlay">
     <overlay android:isStatic="true" android:priority="9999" android:targetPackage="android"/>
-    <application android:hasCode="false" android:label="FaceDetect Framework overlay"/>
+    <application android:hasCode="false" android:label="FaceUnlock Framework overlay"/>
 </manifest>
diff --git a/SettingsOverlay/AndroidManifest.xml b/SettingsOverlay/AndroidManifest.xml
index 8dd453a..c947965 100644
--- a/SettingsOverlay/AndroidManifest.xml
+++ b/SettingsOverlay/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!--suppress ALL -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.libremobileos.facedetect.settings.overlay">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.libremobileos.faceunlock.settings.overlay">
     <overlay android:isStatic="true" android:priority="9998" android:targetPackage="com.android.settings"/>
-    <application android:hasCode="false" android:label="FaceDetect Settings overlay"/>
+    <application android:hasCode="false" android:label="FaceUnlock Settings overlay"/>
 </manifest>
diff --git a/SettingsOverlay/res/values/strings.xml b/SettingsOverlay/res/values/strings.xml
index 833d160..e1991c6 100644
--- a/SettingsOverlay/res/values/strings.xml
+++ b/SettingsOverlay/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- ComponentName to launch a vendor-specific enrollment activity if available -->
-    <string name="config_face_enroll" translatable="false">com.libremobileos.facedetect/com.libremobileos.facedetect.ScanActivity</string>
+    <string name="config_face_enroll" translatable="false">com.libremobileos.faceunlock/com.libremobileos.faceunlock.ScanActivity</string>
 </resources>
diff --git a/app/build.gradle b/app/build.gradle
index 7a5c2b4..db60a16 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,11 +9,11 @@
 }
 
 android {
-	namespace 'com.libremobileos.facedetect'
+	namespace 'com.libremobileos.faceunlock'
 	compileSdk 33
 
 	defaultConfig {
-		applicationId "com.libremobileos.facedetect"
+		applicationId "com.libremobileos.faceunlock"
 		minSdk 31
 		targetSdk 33
 		versionCode 1
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4c25bfa..eee282f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-    package="com.libremobileos.facedetect"
+    package="com.libremobileos.faceunlock"
     android:sharedUserId="android.uid.system">
 
 	<uses-feature
@@ -19,7 +19,7 @@
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
 		android:supportsRtl="true"
-		android:theme="@style/Theme.FaceDetect"
+		android:theme="@style/Theme.FaceUnlock"
 		tools:targetApi="31">
 		<receiver
 			android:directBootAware="true"
@@ -32,10 +32,10 @@
 		</receiver>
 		<activity
 			android:name=".ScanActivity"
-			android:theme="@style/Theme.FaceDetect.NoActionBar"
+			android:theme="@style/Theme.FaceUnlock.NoActionBar"
 			android:exported="false" />
 		<service
-			android:name=".FaceDetectService"
+			android:name=".FaceUnlockService"
 			android:directBootAware="true"
 			android:exported="true"
 			tools:ignore="ExportedService" />
diff --git a/app/src/main/java/com/libremobileos/facedetect/IFaceDetectService.aidl b/app/src/main/java/com/libremobileos/facedetect/IFaceDetectService.aidl
deleted file mode 100644
index 5190f36..0000000
--- a/app/src/main/java/com/libremobileos/facedetect/IFaceDetectService.aidl
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.libremobileos.facedetect;
-
-interface IFaceDetectService {
-    void enrollResult(int remaining);
-    void error(int error);
-    String getStorePath();
-}
diff --git a/app/src/main/java/com/libremobileos/facedetect/CameraActivity.java b/app/src/main/java/com/libremobileos/faceunlock/CameraActivity.java
similarity index 99%
rename from app/src/main/java/com/libremobileos/facedetect/CameraActivity.java
rename to app/src/main/java/com/libremobileos/faceunlock/CameraActivity.java
index a86668b..0c1f786 100644
--- a/app/src/main/java/com/libremobileos/facedetect/CameraActivity.java
+++ b/app/src/main/java/com/libremobileos/faceunlock/CameraActivity.java
@@ -1,4 +1,4 @@
-package com.libremobileos.facedetect;
+package com.libremobileos.faceunlock;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/app/src/main/java/com/libremobileos/facedetect/CameraService.java b/app/src/main/java/com/libremobileos/faceunlock/CameraService.java
similarity index 99%
rename from app/src/main/java/com/libremobileos/facedetect/CameraService.java
rename to app/src/main/java/com/libremobileos/faceunlock/CameraService.java
index a302ec7..7158ae5 100644
--- a/app/src/main/java/com/libremobileos/facedetect/CameraService.java
+++ b/app/src/main/java/com/libremobileos/faceunlock/CameraService.java
@@ -1,4 +1,4 @@
-package com.libremobileos.facedetect;
+package com.libremobileos.faceunlock;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/app/src/main/java/com/libremobileos/facedetect/CircleOverlayView.java b/app/src/main/java/com/libremobileos/faceunlock/CircleOverlayView.java
similarity index 98%
rename from app/src/main/java/com/libremobileos/facedetect/CircleOverlayView.java
rename to app/src/main/java/com/libremobileos/faceunlock/CircleOverlayView.java
index f46bfad..727525f 100644
--- a/app/src/main/java/com/libremobileos/facedetect/CircleOverlayView.java
+++ b/app/src/main/java/com/libremobileos/faceunlock/CircleOverlayView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.libremobileos.facedetect;
+package com.libremobileos.faceunlock;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/app/src/main/java/com/libremobileos/facedetect/FaceDetectService.java b/app/src/main/java/com/libremobileos/faceunlock/FaceUnlockService.java
similarity index 97%
rename from app/src/main/java/com/libremobileos/facedetect/FaceDetectService.java
rename to app/src/main/java/com/libremobileos/faceunlock/FaceUnlockService.java
index 0185216..97f22d1 100644
--- a/app/src/main/java/com/libremobileos/facedetect/FaceDetectService.java
+++ b/app/src/main/java/com/libremobileos/faceunlock/FaceUnlockService.java
@@ -1,4 +1,4 @@
-package com.libremobileos.facedetect;
+package com.libremobileos.faceunlock;
 
 import static android.os.Process.THREAD_PRIORITY_FOREGROUND;
 
@@ -42,12 +42,12 @@
 import java.util.List;
 import java.util.Random;
 
-public class FaceDetectService extends Service {
+public class FaceUnlockService extends Service {
 	private final String TAG = "FaceUnlockService";
 	private final long kDeviceId = 123; // Arbitrary value.
 	private final int kFaceId = 100; // Arbitrary value.
 	private final boolean DEBUG = false;
-	private final String SETTINGS_OVERLAY_PACKAGE = "com.libremobileos.facedetect.settings.overlay";
+	private final String SETTINGS_OVERLAY_PACKAGE = "com.libremobileos.faceunlock.settings.overlay";
 
 	private static final int MSG_CHALLENGE_TIMEOUT = 100;
 
@@ -399,7 +399,7 @@
 		}
 	}
 
-	private final IFaceDetectService.Stub binder = new IFaceDetectService.Stub() {
+	private final IFaceUnlockService.Stub binder = new IFaceUnlockService.Stub() {
 		@Override
 		public void enrollResult(int remaining) throws RemoteException {
 			if (mCallback != null) {
diff --git a/app/src/main/java/com/libremobileos/faceunlock/IFaceUnlockService.aidl b/app/src/main/java/com/libremobileos/faceunlock/IFaceUnlockService.aidl
new file mode 100644
index 0000000..dd4e2ea
--- /dev/null
+++ b/app/src/main/java/com/libremobileos/faceunlock/IFaceUnlockService.aidl
@@ -0,0 +1,7 @@
+package com.libremobileos.faceunlock;
+
+interface IFaceUnlockService {
+    void enrollResult(int remaining);
+    void error(int error);
+    String getStorePath();
+}
diff --git a/app/src/main/java/com/libremobileos/facedetect/OnLockedBootCompleteReceiver.java b/app/src/main/java/com/libremobileos/faceunlock/OnLockedBootCompleteReceiver.java
similarity index 69%
rename from app/src/main/java/com/libremobileos/facedetect/OnLockedBootCompleteReceiver.java
rename to app/src/main/java/com/libremobileos/faceunlock/OnLockedBootCompleteReceiver.java
index 13fb006..92f360f 100644
--- a/app/src/main/java/com/libremobileos/facedetect/OnLockedBootCompleteReceiver.java
+++ b/app/src/main/java/com/libremobileos/faceunlock/OnLockedBootCompleteReceiver.java
@@ -1,4 +1,4 @@
-package com.libremobileos.facedetect;
+package com.libremobileos.faceunlock;
 
 import android.content.BroadcastReceiver;
 import android.content.Intent;
@@ -7,13 +7,13 @@
 import android.util.Log;
 
 public class OnLockedBootCompleteReceiver extends BroadcastReceiver {
-    private static final String LOG_TAG = "FaceDetectBootReceiverService";
+    private static final String LOG_TAG = "FaceUnlockBootReceiverService";
 
     @Override
     public void onReceive(final Context context, Intent intent) {
         Log.i(LOG_TAG, "onBoot");
 
-        Intent sIntent = new Intent(context, FaceDetectService.class);
+        Intent sIntent = new Intent(context, FaceUnlockService.class);
         context.startService(sIntent);
     }
 }
diff --git a/app/src/main/java/com/libremobileos/facedetect/RemoteFaceServiceClient.java b/app/src/main/java/com/libremobileos/faceunlock/RemoteFaceServiceClient.java
similarity index 98%
rename from app/src/main/java/com/libremobileos/facedetect/RemoteFaceServiceClient.java
rename to app/src/main/java/com/libremobileos/faceunlock/RemoteFaceServiceClient.java
index d4f3868..8e0b3d2 100644
--- a/app/src/main/java/com/libremobileos/facedetect/RemoteFaceServiceClient.java
+++ b/app/src/main/java/com/libremobileos/faceunlock/RemoteFaceServiceClient.java
@@ -1,4 +1,4 @@
-package com.libremobileos.facedetect;
+package com.libremobileos.faceunlock;
 
 import android.content.Context;
 import android.util.Base64;
diff --git a/app/src/main/java/com/libremobileos/facedetect/ScanActivity.java b/app/src/main/java/com/libremobileos/faceunlock/ScanActivity.java
similarity index 97%
rename from app/src/main/java/com/libremobileos/facedetect/ScanActivity.java
rename to app/src/main/java/com/libremobileos/faceunlock/ScanActivity.java
index 8ade3f0..0262fd0 100644
--- a/app/src/main/java/com/libremobileos/facedetect/ScanActivity.java
+++ b/app/src/main/java/com/libremobileos/faceunlock/ScanActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.libremobileos.facedetect;
+package com.libremobileos.faceunlock;
 
 import android.annotation.SuppressLint;
 import android.content.ComponentName;
@@ -59,7 +59,7 @@
 
 	private boolean computingDetection = false;
 
-	private IFaceDetectService service;
+	private IFaceUnlockService service;
 
 	protected byte[] mToken;
 	protected int mUserId;
@@ -80,7 +80,7 @@
 	private final ServiceConnection connection = new ServiceConnection() {
 		@Override
 		public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-			service = IFaceDetectService.Stub.asInterface(iBinder);
+			service = IFaceUnlockService.Stub.asInterface(iBinder);
 		}
 
 		@Override
@@ -90,7 +90,7 @@
 	@Override
 	protected void onStart() {
 		super.onStart();
-		Intent intent = new Intent(this, FaceDetectService.class);
+		Intent intent = new Intent(this, FaceUnlockService.class);
 		bindService(intent, connection, Context.BIND_AUTO_CREATE);
 	}
 
diff --git a/app/src/main/res/layout/enroll_main.xml b/app/src/main/res/layout/enroll_main.xml
index e92065f..9f500ae 100644
--- a/app/src/main/res/layout/enroll_main.xml
+++ b/app/src/main/res/layout/enroll_main.xml
@@ -39,7 +39,7 @@
 			android:layout_height="400dp"
 			android:layout_gravity="center" />
 
-		<com.libremobileos.facedetect.CircleOverlayView
+		<com.libremobileos.faceunlock.CircleOverlayView
 			android:id="@+id/overlay"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7081895..01c0559 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-	<string name="app_name">FaceDetect</string>
+	<string name="app_name">FaceUnlock</string>
 	<string name="internal_err">Internal error</string>
 	<string name="face_unlock">Face Unlock</string>
 	<string name="next">Next</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2fc0038..76e93fe 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,11 +1,11 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 	<!-- Base application theme. -->
-	<style name="Theme.FaceDetect" parent="Theme.FaceDetect.Base" />
-	<style name="Theme.FaceDetect.Base" parent="@android:style/Theme.DeviceDefault.DayNight">
+	<style name="Theme.FaceUnlock" parent="Theme.FaceUnlock.Base" />
+	<style name="Theme.FaceUnlock.Base" parent="@android:style/Theme.DeviceDefault.DayNight">
 		<item name="android:colorPrimaryDark">@android:color/transparent</item> <!-- Status bar color -->
 		<item name="android:colorBackground">@android:color/system_neutral1_900</item>
 	</style>
-	<style name="Theme.FaceDetect.NoActionBar" parent="Theme.FaceDetect.Base">
+	<style name="Theme.FaceUnlock.NoActionBar" parent="Theme.FaceUnlock.Base">
 		<item name="android:windowActionBar">false</item>
 		<item name="android:windowNoTitle">true</item>
 	</style>