diff --git a/app/src/androidTest/java/com/cringe_studios/code_guard/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/cringe_studios/code_guard/ExampleInstrumentedTest.java
deleted file mode 100644
index 8a68aee..0000000
--- a/app/src/androidTest/java/com/cringe_studios/code_guard/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.cringe_studios.code_guard;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.cringe_studios.cringe_authenticator", appContext.getPackageName());
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/cringe_studios/code_guard/backup/BackupUtil.java b/app/src/main/java/com/cringe_studios/code_guard/backup/BackupUtil.java
index 22916a2..1fd0701 100644
--- a/app/src/main/java/com/cringe_studios/code_guard/backup/BackupUtil.java
+++ b/app/src/main/java/com/cringe_studios/code_guard/backup/BackupUtil.java
@@ -28,7 +28,7 @@ public class BackupUtil {
     private static final SimpleDateFormat FORMAT = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss", Locale.ENGLISH);
 
     public static String getBackupName() {
-        return "backup_" + FORMAT.format(new Date()); // TODO: indicate Cringe Authenticator
+        return "code_guard_backup_" + FORMAT.format(new Date());
     }
 
     public static void saveBackup(Context context, Uri backupFile, SecretKey key, CryptoParameters parameters) throws BackupException, CryptoException {
diff --git a/app/src/main/res/layout/activity_unlock.xml b/app/src/main/res/layout/activity_unlock.xml
index f007164..469ea75 100644
--- a/app/src/main/res/layout/activity_unlock.xml
+++ b/app/src/main/res/layout/activity_unlock.xml
@@ -10,7 +10,7 @@
         android:id="@+id/unlock_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="@string/unlock_cringe_authenticator"
+        android:text="@string/unlock_authenticator"
         android:textSize="21sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/unlock_password_text"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index db30365..fb27fa0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -71,7 +71,7 @@
     <string name="password">Passwort</string>
     <string name="set_password">Passwort setzen</string>
     <string name="confirm_password">Passwort bestätigen</string>
-    <string name="unlock_cringe_authenticator">Authenticator entsperren</string>
+    <string name="unlock_authenticator">Authenticator entsperren</string>
     <string name="unlock">Entsperren</string>
     <string name="unlock_using_biometrics">Mit Biometrie ensperren</string>
     <string name="name">Name</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4f36b9..c5dfa7c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,7 +55,7 @@
     <string name="password">Password</string>
     <string name="set_password">Set Password</string>
     <string name="confirm_password">Confirm Password</string>
-    <string name="unlock_cringe_authenticator">Unlock Authenticator</string>
+    <string name="unlock_authenticator">Unlock Authenticator</string>
     <string name="unlock">Unlock</string>
     <string name="unlock_using_biometrics">Unlock using biometrics</string>
     <string name="name">Name</string>