diff --git a/libs/lpac-jni/src/main/jni/lpac-jni/lpac-discovery.c b/libs/lpac-jni/src/main/jni/lpac-jni/lpac-discovery.c
index 85d56ab..4ec702c 100644
--- a/libs/lpac-jni/src/main/jni/lpac-jni/lpac-discovery.c
+++ b/libs/lpac-jni/src/main/jni/lpac-jni/lpac-discovery.c
@@ -11,7 +11,7 @@
 jclass euicc_configured_addresses_class;
 jmethodID euicc_configured_addresses_constructor;
 
-jmethodID on_discovered;
+jmethodID on_state_update;
 
 #define DISCOVERY_CALLBACK_CLASS "net/typeblog/lpac_jni/ProfileDiscoveryCallback"
 #define STRING_CLASS "java/lang/String"
@@ -20,7 +20,7 @@ void lpac_discovery_init() {
     LPAC_JNI_SETUP_ENV;
 
     jclass download_callback_class = (*env)->FindClass(env, DISCOVERY_CALLBACK_CLASS);
-    on_discovered = (*env)->GetMethodID(env, download_callback_class, "onDiscovered",
+    on_state_update = (*env)->GetMethodID(env, download_callback_class, "onDiscovered",
                                         "([L" STRING_CLASS ";)V");
 
     euicc_configured_addresses_class = (*env)->FindClass(env, EUICC_CONFIGURED_ADDRESSES_CLASS);
@@ -111,7 +111,7 @@ Java_net_typeblog_lpac_1jni_LpacJni_discoveryProfile(
         (*env)->SetObjectArrayElement(env, addresses, index, element);
     }
 
-    (*env)->CallVoidMethod(env, callback, on_discovered, addresses);
+    (*env)->CallVoidMethod(env, callback, on_state_update, addresses);
 
     out:
     if (_imei != NULL) (*env)->ReleaseStringUTFChars(env, imei, _imei);
diff --git a/libs/lpac-jni/src/main/jni/lpac-jni/lpac-download.c b/libs/lpac-jni/src/main/jni/lpac-jni/lpac-download.c
index 61789c0..bae2ee8 100644
--- a/libs/lpac-jni/src/main/jni/lpac-jni/lpac-download.c
+++ b/libs/lpac-jni/src/main/jni/lpac-jni/lpac-download.c
@@ -11,7 +11,7 @@ jobject download_state_authenticating;
 jobject download_state_downloading;
 jobject download_state_finalizing;
 
-jmethodID on_discovered;
+jmethodID on_state_update;
 
 void lpac_download_init() {
     LPAC_JNI_SETUP_ENV;
@@ -52,8 +52,8 @@ void lpac_download_init() {
 
     jclass download_callback_class = (*env)->FindClass(env,
                                                        "net/typeblog/lpac_jni/ProfileDownloadCallback");
-    on_discovered = (*env)->GetMethodID(env, download_callback_class, "onStateUpdate",
-                                        "(Lnet/typeblog/lpac_jni/ProfileDownloadCallback$DownloadState;)V");
+    on_state_update = (*env)->GetMethodID(env, download_callback_class, "onStateUpdate",
+                                          "(Lnet/typeblog/lpac_jni/ProfileDownloadCallback$DownloadState;)V");
 }
 
 JNIEXPORT jint JNICALL
@@ -79,7 +79,7 @@ Java_net_typeblog_lpac_1jni_LpacJni_downloadProfile(JNIEnv *env, jobject thiz, j
 
     ctx->http.server_address = _smdp;
 
-    (*env)->CallVoidMethod(env, callback, on_discovered, download_state_preparing);
+    (*env)->CallVoidMethod(env, callback, on_state_update, download_state_preparing);
     ret = es10b_get_euicc_challenge_and_info(ctx);
     syslog(LOG_INFO, "es10b_get_euicc_challenge_and_info %d", ret);
     if (ret < 0) {
@@ -87,7 +87,7 @@ Java_net_typeblog_lpac_1jni_LpacJni_downloadProfile(JNIEnv *env, jobject thiz, j
         goto out;
     }
 
-    (*env)->CallVoidMethod(env, callback, on_discovered, download_state_connecting);
+    (*env)->CallVoidMethod(env, callback, on_state_update, download_state_connecting);
     ret = es9p_initiate_authentication(ctx);
     syslog(LOG_INFO, "es9p_initiate_authentication %d", ret);
     if (ret < 0) {
@@ -95,7 +95,7 @@ Java_net_typeblog_lpac_1jni_LpacJni_downloadProfile(JNIEnv *env, jobject thiz, j
         goto out;
     }
 
-    (*env)->CallVoidMethod(env, callback, on_discovered, download_state_authenticating);
+    (*env)->CallVoidMethod(env, callback, on_state_update, download_state_authenticating);
     ret = es10b_authenticate_server(ctx, _matching_id, _imei);
     syslog(LOG_INFO, "es10b_authenticate_server %d", ret);
     if (ret < 0) {
@@ -109,7 +109,7 @@ Java_net_typeblog_lpac_1jni_LpacJni_downloadProfile(JNIEnv *env, jobject thiz, j
         goto out;
     }
 
-    (*env)->CallVoidMethod(env, callback, on_discovered, download_state_downloading);
+    (*env)->CallVoidMethod(env, callback, on_state_update, download_state_downloading);
     ret = es10b_prepare_download(ctx, _confirmation_code);
     syslog(LOG_INFO, "es10b_prepare_download %d", ret);
     if (ret < 0) {
@@ -121,7 +121,7 @@ Java_net_typeblog_lpac_1jni_LpacJni_downloadProfile(JNIEnv *env, jobject thiz, j
     if (ret < 0)
         goto out;
 
-    (*env)->CallVoidMethod(env, callback, on_discovered, download_state_finalizing);
+    (*env)->CallVoidMethod(env, callback, on_state_update, download_state_finalizing);
     ret = es10b_load_bound_profile_package(ctx, &es10b_load_bound_profile_package_result);
     syslog(LOG_INFO, "es10b_load_bound_profile_package %d, reason %d", ret, es10b_load_bound_profile_package_result.errorReason);
     if (ret < 0) {