diff --git a/android/build.gradle b/android/build.gradle
index 516da6b..ee0856d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,7 +4,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 def pEpEngineSrc = hasProperty('pEpEngineSrc') ? pEpEngineSrc : "../../pEpEngine"
 def buildAutomatic = hasProperty('buildAutomatic') ? buildAutomatic : "true"
-def pEpAppPackageName = hasProperty('pEpAppPackageName') ? pEpAppPackageName : "com.pep.k9"
+def pEpAppPackageName = hasProperty('pEpAppPackageName') ? pEpAppPackageName : "pep.android.k9"
 
 def externalInstallDir = file('external/data/data/' + pEpAppPackageName + '/app_opt')
 def externalIncludePath = new File(externalInstallDir, 'include').absolutePath
diff --git a/src/basic_api.cc b/src/basic_api.cc
index b2b315b..bc24ec9 100644
--- a/src/basic_api.cc
+++ b/src/basic_api.cc
@@ -180,7 +180,7 @@ JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_config_1passive_1mode(
 }
 
 
-JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_config_unencrypted_subject(
+JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_config_1unencrypted_1subject(
         JNIEnv *env,
         jobject obj,
         jboolean enable