diff --git a/Interface.cpp b/Interface.cpp
index 302ce73..9f5351c 100644
--- a/Interface.cpp
+++ b/Interface.cpp
@@ -72,7 +72,9 @@
             out << "::android::hardware::hidl_vec<::android::hardware::hidl_string> _hidl_return;\n";
             out << "_hidl_return.resize(" << chain.size() << ");\n";
             for (size_t i = 0; i < chain.size(); ++i) {
-                out << "_hidl_return[" << i << "] = \"" << chain[i]->fqName().string() << "\";\n";
+                out << "_hidl_return[" << i << "] = "
+                    << chain[i]->fullName()
+                    << "::descriptor;\n";
             }
             out << "_hidl_cb(_hidl_return);\n";
             out << "return ::android::hardware::Void();";
@@ -84,7 +86,7 @@
             for (size_t i = 0; i < chain.size(); ++i) {
                 if (i != 0)
                     out << ",\n";
-                out << "\"" << chain[i]->fqName().string() << "\"";
+                out << chain[i]->fullJavaName() << ".kInterfaceName";
             }
             out << "));";
             out.unindent(); out.unindent();