diff --git a/src/main/java/be/seeseepuff/pcinv/models/CdDriveAsset.java b/src/main/java/be/seeseepuff/pcinv/models/OpticalDriveAsset.java
similarity index 93%
rename from src/main/java/be/seeseepuff/pcinv/models/CdDriveAsset.java
rename to src/main/java/be/seeseepuff/pcinv/models/OpticalDriveAsset.java
index 303c202..279623d 100644
--- a/src/main/java/be/seeseepuff/pcinv/models/CdDriveAsset.java
+++ b/src/main/java/be/seeseepuff/pcinv/models/OpticalDriveAsset.java
@@ -9,12 +9,12 @@ import lombok.Setter;
 @Setter
 @Entity
 @AssetInfo(
-		displayName = "CD Drive",
-		pluralName = "CD Drives",
-		type = "cd_drive"
+		displayName = "Optical Drive",
+		pluralName = "Optical Drives",
+		type = "optical_drive"
 )
-@Table(name = "cd_drive_assets")
-public class CdDriveAsset implements Asset
+@Table(name = "optical_drive_assets")
+public class OpticalDriveAsset implements Asset
 {
 	@Id
 	@GeneratedValue
diff --git a/src/main/java/be/seeseepuff/pcinv/repositories/CdDriveRepository.java b/src/main/java/be/seeseepuff/pcinv/repositories/CdDriveRepository.java
deleted file mode 100644
index 8e4e48c..0000000
--- a/src/main/java/be/seeseepuff/pcinv/repositories/CdDriveRepository.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package be.seeseepuff.pcinv.repositories;
-
-import be.seeseepuff.pcinv.models.CdDriveAsset;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-@SuppressWarnings("unused")
-public interface CdDriveRepository extends JpaRepository<CdDriveAsset, Long>, AssetRepository<CdDriveAsset> {
-    @Override
-    default Class<CdDriveAsset> getAssetType() {
-        return CdDriveAsset.class;
-    }
-}
diff --git a/src/main/java/be/seeseepuff/pcinv/repositories/OpticalDriveRepository.java b/src/main/java/be/seeseepuff/pcinv/repositories/OpticalDriveRepository.java
new file mode 100644
index 0000000..9a1310b
--- /dev/null
+++ b/src/main/java/be/seeseepuff/pcinv/repositories/OpticalDriveRepository.java
@@ -0,0 +1,12 @@
+package be.seeseepuff.pcinv.repositories;
+
+import be.seeseepuff.pcinv.models.OpticalDriveAsset;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+@SuppressWarnings("unused")
+public interface OpticalDriveRepository extends JpaRepository<OpticalDriveAsset, Long>, AssetRepository<OpticalDriveAsset> {
+    @Override
+    default Class<OpticalDriveAsset> getAssetType() {
+        return OpticalDriveAsset.class;
+    }
+}