--- a/java_stubs/javaregistry/clientserver/client/inc/javaregconverter.h	Sun Mar 14 13:09:01 2010 +0000
+++ b/java_stubs/javaregistry/clientserver/client/inc/javaregconverter.h	Sun Mar 28 16:35:58 2010 +0100
@@ -209,7 +209,7 @@
      * @param aCertChains [out] The method converts the unicode descriptors
      *                          into this RPointerArray<HBufC>.
      */
-    IMPORT_C static void JavaRegConverter::GetUnicodeDescriptorsL(
+    IMPORT_C static void GetUnicodeDescriptorsL(
         const TDesC& aValue,
         RPointerArray<HBufC>& aDescriptors);
     /**
@@ -224,7 +224,7 @@
      * @param aDes [out] Descriptor parameter, storing, and the returning
      * the certificate chains.
      */
-    IMPORT_C static void JavaRegConverter::StoreUnicodeDescriptorsL(
+    IMPORT_C static void StoreUnicodeDescriptorsL(
         const RPointerArray<HBufC>& aValue,
         HBufC*& aDes);
 };

--- a/jrt_plat/java_env_info_api/inc/javaenvinfo.h	Sun Mar 14 13:09:01 2010 +0000
+++ b/jrt_plat/java_env_info_api/inc/javaenvinfo.h	Sun Mar 28 16:35:58 2010 +0100
@@ -71,7 +71,7 @@
     IMPORT_C static HBufC* GetPlatformInfoL();
 private:
 
-    static TVersion JavaEnvInfo::GetJavaVersionL();
+    static TVersion GetJavaVersionL();
 };
 
 }

--- a/jrt_plat/java_registry_api/inc/javaregistryentry.h	Sun Mar 14 13:09:01 2010 +0000
+++ b/jrt_plat/java_registry_api/inc/javaregistryentry.h	Sun Mar 28 16:35:58 2010 +0100
@@ -148,8 +148,7 @@
      * @return MJavaAttribute poiter to instance, which contain attribute.
      * If attribute doesn't exist return NULL.
      */
-    IMPORT_C const MJavaAttribute*
-    CJavaRegistryEntry::AttributeL(const TDesC& aName) const;
+    IMPORT_C const MJavaAttribute* AttributeL(const TDesC& aName) const;
 
     /**
      * CJavaRegistryEntry::Attributes method gets the
@@ -158,8 +157,7 @@
      * @since S60 v5.0
      * @return RPointerArray& with all additional attributes.
      */
-    IMPORT_C const RPointerArray<MJavaAttribute>&
-    CJavaRegistryEntry::AttributesL() const;
+    IMPORT_C const RPointerArray<MJavaAttribute>& AttributesL() const;
 
 protected: