diff --git a/colorchord2/android/AndroidManifest.xml b/colorchord2/android/AndroidManifest.xml
index 9eda6bc..1052ea0 100644
--- a/colorchord2/android/AndroidManifest.xml
+++ b/colorchord2/android/AndroidManifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="com.cnlohr.colorchordtest" 
-          android:versionCode="4">
+<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.cnlohr.colorchord" 
+          android:versionCode="3">
 
     <uses-permission android:name="android.permission.SET_RELEASE_APP"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
-    <application android:debuggable="false" android:hasCode="false" android:label="colorchordtest"  tools:replace="android:icon,android:theme,android:allowBackup,label" android:icon="@mipmap/icon" android:requestLegacyExternalStorage="true">
-        <activity android:configChanges="keyboardHidden|orientation" android:label="colorchordtest" android:name="android.app.NativeActivity">
+    <application android:debuggable="false" android:hasCode="false" android:label="colorchord"  tools:replace="android:icon,android:theme,android:allowBackup,label" android:icon="@mipmap/icon" android:requestLegacyExternalStorage="true">
+        <activity android:configChanges="keyboardHidden|orientation" android:label="colorchord" android:name="android.app.NativeActivity">
 
 			<!-- This device filter seems to do nothing at all! If you figure out how to use it or what it does, let me know!! -->
 			<intent-filter>
@@ -15,7 +15,7 @@
 			</intent-filter>
 			<meta-data android:name="android.hardware.usb.action.ACTION_USB_DEVICE_ATTACHED" android:resource="@xml/device_filter" />
 
-            <meta-data android:name="android.app.lib_name" android:value="colorchordtest"/>
+            <meta-data android:name="android.app.lib_name" android:value="colorchord"/>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/colorchord2/android/Makefile b/colorchord2/android/Makefile
index e8cfd8e..095158b 100644
--- a/colorchord2/android/Makefile
+++ b/colorchord2/android/Makefile
@@ -1,10 +1,10 @@
 
-APPNAME=colorchordtest
+APPNAME=colorchord
 RAWDRAWANDROID=rawdrawandroid
-PACKAGENAME?=com.cnlohr.$(APPNAME)
+PACKAGENAME?=org.cnlohr.$(APPNAME)
 
 CFLAGS:=-I. -I.. -Irawdrawandroid/rawdraw -I../cnfa -I../../embeddedcommon -ffunction-sections -Os -DPRINTF_NO_OVERRIDDE
-LDFLAGS:=-s -lOpenSLES 
+LDFLAGS:=-s -lOpenSLES
 
 CC_C:=  ../main.c  ../dft.c ../decompose.c ../filter.c ../color.c ../notefinder.c ../util.c ../hook.c ../outdrivers.c ../parameters.c ../chash.c ../OutputVoronoi.c ../OutputProminent.c ../DisplayArray.c ../OutputLinear.c ../DisplayPie.c ../DisplayNetwork.c ../../embeddedcommon/DFT32.c ../OutputCells.c ../configs.c