diff --git a/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/Configuration.kt b/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/Configuration.kt
index 82486c32..c5866f8c 100644
--- a/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/Configuration.kt
+++ b/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/Configuration.kt
@@ -5,7 +5,7 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "configurations")
-data class ConfigurationEntity(
+data class Configuration(
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "_id") val _id: Int?,
     @ColumnInfo(name = "name") val name: String,
diff --git a/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationDao.kt b/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationDao.kt
index 747ac560..4f8ed64a 100644
--- a/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationDao.kt
+++ b/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationDao.kt
@@ -9,10 +9,10 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface ConfigurationsDao {
     @Query("SELECT * FROM configurations")
-    fun getAllConfigurations(): Flow<List<ConfigurationEntity>>
+    fun getAllConfigurations(): Flow<List<Configuration>>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertConfiguration(configuration: ConfigurationEntity): Long
+    suspend fun insertConfiguration(configuration: Configuration): Long
 
     @Query("DELETE FROM configurations WHERE name = :configurationName")
     suspend fun deleteConfiguration(configurationName: String)
diff --git a/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationDatabase.kt b/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationsDatabase.kt
similarity index 64%
rename from lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationDatabase.kt
rename to lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationsDatabase.kt
index 62945e85..dc6260bc 100644
--- a/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationDatabase.kt
+++ b/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/ConfigurationsDatabase.kt
@@ -4,9 +4,9 @@ import androidx.room.Database
 import androidx.room.RoomDatabase
 
 @Database(
-    entities = [ConfigurationEntity::class],
+    entities = [Configuration::class],
     version = 3
 )
-internal abstract class ConfigurationDatabase : RoomDatabase() {
+abstract class ConfigurationsDatabase : RoomDatabase() {
     abstract fun configurationDao(): ConfigurationsDao
 }
\ No newline at end of file
diff --git a/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/di/DaoHiltModule.kt b/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/di/DaoHiltModule.kt
index e163f656..091a34f6 100644
--- a/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/di/DaoHiltModule.kt
+++ b/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/di/DaoHiltModule.kt
@@ -4,7 +4,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import no.nordicsemi.android.toolbox.lib.storage.ConfigurationDatabase
+import no.nordicsemi.android.toolbox.lib.storage.ConfigurationsDatabase
 import no.nordicsemi.android.toolbox.lib.storage.ConfigurationsDao
 import javax.inject.Singleton
 
@@ -14,7 +14,7 @@ class DaoHiltModule {
 
     @Provides
     @Singleton
-    internal fun provideDeviceDao(db: ConfigurationDatabase): ConfigurationsDao {
+    internal fun provideDeviceDao(db: ConfigurationsDatabase): ConfigurationsDao {
         return db.configurationDao()
     }
 }
\ No newline at end of file
diff --git a/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/di/DbHiltModule.kt b/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/di/DbHiltModule.kt
index 9999dc94..51c42d76 100644
--- a/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/di/DbHiltModule.kt
+++ b/lib_storage/src/main/java/no/nordicsemi/android/toolbox/lib/storage/di/DbHiltModule.kt
@@ -7,7 +7,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import no.nordicsemi.android.toolbox.lib.storage.ConfigurationDatabase
+import no.nordicsemi.android.toolbox.lib.storage.ConfigurationsDatabase
 import no.nordicsemi.android.toolbox.lib.storage.MIGRATION_1_2
 import javax.inject.Singleton
 
@@ -17,10 +17,10 @@ class DbHiltModule {
 
     @Provides
     @Singleton
-    internal fun provideDeviceDB(@ApplicationContext context: Context): ConfigurationDatabase {
+    internal fun provideDeviceDB(@ApplicationContext context: Context): ConfigurationsDatabase {
         return Room.databaseBuilder(
             context,
-            ConfigurationDatabase::class.java,
+            ConfigurationsDatabase::class.java,
             "toolbox_uart.db"
         )
             .addMigrations(MIGRATION_1_2)
diff --git a/profile/src/main/java/no/nordicsemi/android/toolbox/profile/repository/uartXml/UartConfigurationRepository.kt b/profile/src/main/java/no/nordicsemi/android/toolbox/profile/repository/uartXml/UartConfigurationRepository.kt
index 95ffb5c5..247b088d 100644
--- a/profile/src/main/java/no/nordicsemi/android/toolbox/profile/repository/uartXml/UartConfigurationRepository.kt
+++ b/profile/src/main/java/no/nordicsemi/android/toolbox/profile/repository/uartXml/UartConfigurationRepository.kt
@@ -2,7 +2,7 @@ package no.nordicsemi.android.toolbox.profile.repository.uartXml
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import no.nordicsemi.android.toolbox.lib.storage.ConfigurationEntity
+import no.nordicsemi.android.toolbox.lib.storage.Configuration
 import no.nordicsemi.android.toolbox.lib.storage.ConfigurationsDao
 import no.nordicsemi.android.toolbox.profile.data.uart.MacroIcon
 import no.nordicsemi.android.toolbox.profile.data.uart.UARTConfiguration
@@ -29,7 +29,7 @@ internal class UartConfigurationRepository @Inject constructor(
             configurations.mapNotNull { it.toDomain() }
         }
 
-    private fun ConfigurationEntity.toDomain(): UARTConfiguration? {
+    private fun Configuration.toDomain(): UARTConfiguration? {
         return try {
             val xml: String = xml
             val format = Format(HyphenStyle())
@@ -67,7 +67,7 @@ internal class UartConfigurationRepository @Inject constructor(
         configurationDao.deleteConfiguration(configuration.name)
     }
 
-    private fun UARTConfiguration.toConfigurationEntity(): ConfigurationEntity? {
+    private fun UARTConfiguration.toConfigurationEntity(): Configuration? {
         return try {
             val format = Format(HyphenStyle())
             val strategy: Strategy = VisitorStrategy(CommentVisitor())
@@ -75,7 +75,7 @@ internal class UartConfigurationRepository @Inject constructor(
             val writer = StringWriter()
             serializer.write(this.toXmlConfiguration(), writer)
 
-            return ConfigurationEntity(
+            return Configuration(
                 _id = id,
                 name = name,
                 xml = writer.toString(),