diff --git a/entry/src/main/config.json b/entry/src/main/config.json
index d38b7d39e1156afd15e1ea10d4aaa1b08f428d0c..e3667633eaaa9375e07062be6fa7ad7a51928135 100644
--- a/entry/src/main/config.json
+++ b/entry/src/main/config.json
@@ -1,6 +1,6 @@
 {
   "app": {
-    "bundleName": "de.adorsys.android.securestoragetest",
+    "bundleName": "de.adorsys.ohos.securestoragetest",
     "vendor": "adorsys",
     "version": {
       "code": 1000000,
diff --git a/entry/src/ohosTest/java/de/adorsys/android/securestoragetest/ExampleOhosTest.java b/entry/src/ohosTest/java/de/adorsys/ohos/securestoragetest/ExampleOhosTest.java
similarity index 97%
rename from entry/src/ohosTest/java/de/adorsys/android/securestoragetest/ExampleOhosTest.java
rename to entry/src/ohosTest/java/de/adorsys/ohos/securestoragetest/ExampleOhosTest.java
index 1aa5bfbd3be0582c28b49cc41239387c701a6d65..f39643c350cf9779f9ae8ced7f75923da8f45686 100644
--- a/entry/src/ohosTest/java/de/adorsys/android/securestoragetest/ExampleOhosTest.java
+++ b/entry/src/ohosTest/java/de/adorsys/ohos/securestoragetest/ExampleOhosTest.java
@@ -14,7 +14,7 @@
  *
  */
 
-package de.adorsys.android.securestoragetest;
+package de.adorsys.ohos.securestoragetest;
 
 import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry;
 import org.junit.Test;
@@ -34,7 +34,7 @@ public class ExampleOhosTest {
     @Test
     public void testBundleName() {
         final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName();
-        assertEquals("de.adorsys.android.securestoragetest", actualBundleName);
+        assertEquals("de.adorsys.ohos.securestoragetest", actualBundleName);
     }
 
     /**
diff --git a/entry/src/test/java/de/adorsys/android/securestoragetest/ExampleTest.java b/entry/src/test/java/de/adorsys/ohos/securestoragetest/ExampleTest.java
similarity index 68%
rename from entry/src/test/java/de/adorsys/android/securestoragetest/ExampleTest.java
rename to entry/src/test/java/de/adorsys/ohos/securestoragetest/ExampleTest.java
index 1b053c540c41f1f07eac0a6fb210aab197f2296e..165e7ab80c8e4fab359b9f9c76dc5988096cd7ef 100644
--- a/entry/src/test/java/de/adorsys/android/securestoragetest/ExampleTest.java
+++ b/entry/src/test/java/de/adorsys/ohos/securestoragetest/ExampleTest.java
@@ -1,4 +1,4 @@
-package de.adorsys.android.securestoragetest;
+package de.adorsys.ohos.securestoragetest;
 
 import org.junit.Test;
 
diff --git a/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/PRNGFixes.java b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/PRNGFixes.java
index 519bb23b845b62a19cc2877a7d9b372ea88433bc..087d4b2d5f278ddb30a78fc3938b971b7a68971f 100644
--- a/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/PRNGFixes.java
+++ b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/PRNGFixes.java
@@ -163,7 +163,6 @@ public final class PRNGFixes {
      */
     private static String getDeviceSerialNumber() {
         // We're using the Reflection API because Build.SERIAL is only available
-        // since API Level 9 (Gingerbread, Android 2.3).
         try {
             return (String) System.class.getField("SERIAL").get(null);
         } catch (Exception ignored) {
diff --git a/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/SecurePreferences.java b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/SecurePreferences.java
index f28037647f918dade67196231ec1e4cc5eb7472f..3a8e62d3fb4899ba20315afacf88d5a234845f3d 100644
--- a/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/SecurePreferences.java
+++ b/securestoragelibrary/src/main/java/de/adorsys/ohos/securestoragelibrary/SecurePreferences.java
@@ -41,7 +41,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the Android Device
+     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the OpenHarmony Device
      *
      * @param context Context is used internally
      * @param key     Key used to identify the stored value in SecureStorage
@@ -65,7 +65,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the Android Device
+     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the OpenHarmony Device
      *
      * @param context Context is used internally
      * @param key     Key used to identify the stored value in SecureStorage
@@ -77,7 +77,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the Android Device
+     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the OpenHarmony Device
      *
      * @param context Context is used internally
      * @param key     Key used to identify the stored value in SecureStorage
@@ -89,7 +89,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the Android Device
+     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the OpenHarmony Device
      *
      * @param context Context is used internally
      * @param key     Key used to identify the stored value in SecureStorage
@@ -101,7 +101,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the Android Device
+     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the OpenHarmony Device
      *
      * @param context Context is used internally
      * @param key     Key used to identify the stored value in SecureStorage
@@ -113,7 +113,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the Android Device
+     * Takes plain string value, encrypts it and stores it encrypted in the SecureStorage on the OpenHarmony Device
      *
      * @param context Context is used internally
      * @param key     Key used to identify the stored value in SecureStorage
@@ -129,7 +129,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Gets encrypted String value for given key from the SecureStorage on the Android Device, decrypts it and returns it
+     * Gets encrypted String value for given key from the SecureStorage on the OpenHarmony Device, decrypts it and returns it
      *
      * @param context  Context is used internally
      * @param key      Key used to identify the stored value in SecureStorage
@@ -153,7 +153,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Gets encrypted boolean value for given key from the SecureStorage on the Android Device, decrypts it and returns it
+     * Gets encrypted boolean value for given key from the SecureStorage on the OpenHarmony Device, decrypts it and returns it
      *
      * @param context  Context is used internally
      * @param key      Key used to identify the stored value in SecureStorage
@@ -165,7 +165,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Gets encrypted float value for given key from the SecureStorage on the Android Device, decrypts it and returns it
+     * Gets encrypted float value for given key from the SecureStorage on the OpenHarmony Device, decrypts it and returns it
      *
      * @param context  Context is used internally
      * @param key      Key used to identify the stored value in SecureStorage
@@ -177,7 +177,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Gets encrypted long value for given key from the SecureStorage on the Android Device, decrypts it and returns it
+     * Gets encrypted long value for given key from the SecureStorage on the OpenHarmony Device, decrypts it and returns it
      *
      * @param context  Context is used internally
      * @param key      Key used to identify the stored value in SecureStorage
@@ -189,7 +189,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Gets encrypted int value for given key  from the SecureStorage on the Android Device, decrypts it and returns it
+     * Gets encrypted int value for given key  from the SecureStorage on the OpenHarmony Device, decrypts it and returns it
      *
      * @param context  Context is used internally
      * @param key      Key used to identify the stored value in SecureStorage
@@ -201,7 +201,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Gets encrypted int value for given key  from the SecureStorage on the Android Device, decrypts it and returns it
+     * Gets encrypted int value for given key  from the SecureStorage on the OpenHarmony Device, decrypts it and returns it
      *
      * @param context  Context is used internally
      * @param key      Key used to identify the stored value in SecureStorage
@@ -246,7 +246,7 @@ public final class SecurePreferences {
     }
 
     /**
-     * Clears all values from the SecureStorage on the Android Device and deletes the en/decryption keys
+     * Clears all values from the SecureStorage on the OpenHarmony Device and deletes the en/decryption keys
      * Means new keys/keypairs have to be generated for the library to be able to work
      *
      * @param context Context is used internally
diff --git a/securestoragelibrary/src/test/java/de/adorsys/android/securestoragelibrary/ExampleTest.java b/securestoragelibrary/src/test/java/de/adorsys/ohos/securestoragelibrary/ExampleTest.java
similarity index 66%
rename from securestoragelibrary/src/test/java/de/adorsys/android/securestoragelibrary/ExampleTest.java
rename to securestoragelibrary/src/test/java/de/adorsys/ohos/securestoragelibrary/ExampleTest.java
index 9610fe7f3790ec4c1dc87e719a4c24c87d6dc438..2e2d695e0c1e8a47977f9cf1214ed202da71ec69 100644
--- a/securestoragelibrary/src/test/java/de/adorsys/android/securestoragelibrary/ExampleTest.java
+++ b/securestoragelibrary/src/test/java/de/adorsys/ohos/securestoragelibrary/ExampleTest.java
@@ -1,4 +1,4 @@
-package de.adorsys.android.securestoragelibrary;
+package de.adorsys.ohos.securestoragelibrary;
 
 import org.junit.Test;