diff --git a/wrappers/java/genwrapper.py b/wrappers/java/genwrapper.py
index d1b3b52ef..1a295e4d9 100644
--- a/wrappers/java/genwrapper.py
+++ b/wrappers/java/genwrapper.py
@@ -591,7 +591,8 @@ class JniInterface(object):
     def __init__(self, javaClass, apiClass):
         self.isSingleListener = (not apiClass.multilistener)
         self.isMultiListener = (apiClass.multilistener)
-        self.classCName = javaClass.className
+        self.className = javaClass.className
+        self.classCName = javaClass.cName
         self.cPrefix = javaClass.cPrefix
         self.callbacks = []
         listener = apiClass.listenerInterface
@@ -694,6 +695,7 @@ class Jni(object):
                 'isSingleListener': jniInterface.isSingleListener,
                 'isMultiListener': jniInterface.isMultiListener,
                 'classCName': jniInterface.classCName,
+                'className': jniInterface.className,
                 'cPrefix': jniInterface.cPrefix,
                 'jniPackage': self.jni_package,
                 'factoryName': javaClass.factoryName,
diff --git a/wrappers/java/jni.mustache b/wrappers/java/jni.mustache
index 3bf1bf85d..ba7172de0 100644
--- a/wrappers/java/jni.mustache
+++ b/wrappers/java/jni.mustache
@@ -234,10 +234,10 @@ static {{return}} {{callbackName}}({{params}}) {
 
 {{#interfaces}}
 {{#isSingleListener}}
-void {{jniPackage}}{{classCName}}Impl_setListener(JNIEnv* env, jobject thiz, jlong ptr, jobject jlistener) {
+void {{jniPackage}}{{className}}Impl_setListener(JNIEnv* env, jobject thiz, jlong ptr, jobject jlistener) {
 {{/isSingleListener}}
 {{#isMultiListener}}
-void {{jniPackage}}{{classCName}}Impl_addListener(JNIEnv* env, jobject thiz, jlong ptr, jobject jlistener) {
+void {{jniPackage}}{{className}}Impl_addListener(JNIEnv* env, jobject thiz, jlong ptr, jobject jlistener) {
 {{/isMultiListener}}
 	{{classCName}} *cptr = ({{classCName}}*)ptr;
 	jobject listener = env->NewGlobalRef(jlistener);
@@ -257,7 +257,7 @@ void {{jniPackage}}{{classCName}}Impl_addListener(JNIEnv* env, jobject thiz, jlo
 }
 {{#isMultiListener}}
 
-void {{jniPackage}}{{classCName}}Impl_removeListener(JNIEnv* env, jobject thiz, jlong ptr, jobject jlistener) {
+void {{jniPackage}}{{className}}Impl_removeListener(JNIEnv* env, jobject thiz, jlong ptr, jobject jlistener) {
 	{{classCName}} *cptr = ({{classCName}}*)ptr;
 	const bctbx_list_t *cbs_list = {{cPrefix}}_get_callbacks_list(cptr);
 	bctbx_list_t *it;