diff --git a/demo/src/main/java/dev/oxmc/androiddeviceinfo_demo/MainActivity.kt b/demo/src/main/java/dev/oxmc/androiddeviceinfo_demo/MainActivity.kt
index 9758c26..77bdfee 100644
--- a/demo/src/main/java/dev/oxmc/androiddeviceinfo_demo/MainActivity.kt
+++ b/demo/src/main/java/dev/oxmc/androiddeviceinfo_demo/MainActivity.kt
@@ -19,8 +19,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
-import dev.oxmc.androiddevicenames.DeviceInfo
-import dev.oxmc.androiddevicenames.AndroidInfo
+import dev.oxmc.androiddeviceinfo.DeviceInfo
+import dev.oxmc.androiddeviceinfo.AndroidInfo
 import dev.oxmc.androiddeviceinfo_demo.ui.theme.AndroidDeviceInfoTheme
 import kotlinx.coroutines.launch
 
@@ -66,12 +66,13 @@ fun DeviceInfoScreen() {
                 androidVersion = "${AndroidInfo.Version.release} (SDK ${AndroidInfo.Version.sdkInt})"
 
                 serial = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                    @Suppress("DEPRECATION")
                     Build.SERIAL.takeIf { it != Build.UNKNOWN }
                         ?: Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
                 } else {
                     try {
                         Build.getSerial()
-                    } catch (e: SecurityException) {
+                    } catch (_: SecurityException) {
                         Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
                     }
                 }
diff --git a/library/src/main/java/dev/oxmc/androiddevicenames/AltDeviceNames.kt b/library/src/main/java/dev/oxmc/androiddeviceinfo/AltDeviceNames.kt
similarity index 99%
rename from library/src/main/java/dev/oxmc/androiddevicenames/AltDeviceNames.kt
rename to library/src/main/java/dev/oxmc/androiddeviceinfo/AltDeviceNames.kt
index 61786a9..aeee564 100644
--- a/library/src/main/java/dev/oxmc/androiddevicenames/AltDeviceNames.kt
+++ b/library/src/main/java/dev/oxmc/androiddeviceinfo/AltDeviceNames.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package dev.oxmc.androiddevicenames
+package dev.oxmc.androiddeviceinfo
 
 object AltDeviceNames {
     /**
diff --git a/library/src/main/java/dev/oxmc/androiddevicenames/AndroidInfo.kt b/library/src/main/java/dev/oxmc/androiddeviceinfo/AndroidInfo.kt
similarity index 99%
rename from library/src/main/java/dev/oxmc/androiddevicenames/AndroidInfo.kt
rename to library/src/main/java/dev/oxmc/androiddeviceinfo/AndroidInfo.kt
index 1bdfba3..81da799 100644
--- a/library/src/main/java/dev/oxmc/androiddevicenames/AndroidInfo.kt
+++ b/library/src/main/java/dev/oxmc/androiddeviceinfo/AndroidInfo.kt
@@ -1,4 +1,4 @@
-package dev.oxmc.androiddevicenames
+package dev.oxmc.androiddeviceinfo
 
 import android.content.Context
 import android.os.Build
diff --git a/library/src/main/java/dev/oxmc/androiddevicenames/DBHelper.kt b/library/src/main/java/dev/oxmc/androiddeviceinfo/DBHelper.kt
similarity index 99%
rename from library/src/main/java/dev/oxmc/androiddevicenames/DBHelper.kt
rename to library/src/main/java/dev/oxmc/androiddeviceinfo/DBHelper.kt
index 189907d..7690ad0 100644
--- a/library/src/main/java/dev/oxmc/androiddevicenames/DBHelper.kt
+++ b/library/src/main/java/dev/oxmc/androiddeviceinfo/DBHelper.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package dev.oxmc.androiddevicenames
+package dev.oxmc.androiddeviceinfo
 
 import android.content.Context
 import android.database.SQLException
diff --git a/library/src/main/java/dev/oxmc/androiddevicenames/DeviceInfo.kt b/library/src/main/java/dev/oxmc/androiddeviceinfo/DeviceInfo.kt
similarity index 97%
rename from library/src/main/java/dev/oxmc/androiddevicenames/DeviceInfo.kt
rename to library/src/main/java/dev/oxmc/androiddeviceinfo/DeviceInfo.kt
index 75a8aa5..7514f55 100755
--- a/library/src/main/java/dev/oxmc/androiddevicenames/DeviceInfo.kt
+++ b/library/src/main/java/dev/oxmc/androiddeviceinfo/DeviceInfo.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package dev.oxmc.androiddevicenames
+package dev.oxmc.androiddeviceinfo
 
 import android.content.Context
 import android.os.Build
diff --git a/library/src/main/java/dev/oxmc/androiddevicenames/DeviceName.kt b/library/src/main/java/dev/oxmc/androiddeviceinfo/DeviceName.kt
similarity index 96%
rename from library/src/main/java/dev/oxmc/androiddevicenames/DeviceName.kt
rename to library/src/main/java/dev/oxmc/androiddeviceinfo/DeviceName.kt
index e5ce2ab..dfa53f5 100644
--- a/library/src/main/java/dev/oxmc/androiddevicenames/DeviceName.kt
+++ b/library/src/main/java/dev/oxmc/androiddeviceinfo/DeviceName.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package dev.oxmc.androiddevicenames
+package dev.oxmc.androiddeviceinfo
 
 import android.content.Context
 import android.os.Build
@@ -75,8 +75,6 @@ object AndroidDeviceInfo {
             model
         }
 
-        //Log.i("DeviceInfo", "Device name: $finalDeviceName, codename: $codename, model: $model, manufacturer: $manufacturer")
-
         return DeviceInfo(manufacturer, finalDeviceName, codename, model)
     }