diff --git a/library/device.dcm b/library/device.dcm
index 142bdeba..9de9f6f0 100644
--- a/library/device.dcm
+++ b/library/device.dcm
@@ -827,36 +827,16 @@ D Ohmmeter, measures resistance
 K Ohmmeter
 $ENDCMP
 #
-$CMP OPAMP_DUAL
-D Dual Opamp, SOIC/DIP/SSOP/TO-99
+$CMP Opamp_Dual_Generic
+D Dual Opamp, SOIC-8/DIP-8/SSOP-8/TO-99
 K dual opamp
 $ENDCMP
 #
-$CMP OPAMP_QUAD
-D Quad Opamp, SOIC/DIP/SSOP
+$CMP Opamp_Quad_Generic
+D Quad Opamp, SOIC-14/DIP-14/SSOP-14
 K quad opamp
 $ENDCMP
 #
-$CMP OPAMP_SINGLE_NULL15
-D Single Opamp, Pins 1 and 5 Null, SOIC/DIP/SSOP/TO-99
-K single opamp
-$ENDCMP
-#
-$CMP OPAMP_SINGLE_NULL18
-D Single Opamp, Pins 1 and 8 Null, SOIC/DIP/SSOP/TO-99
-K single opamp
-$ENDCMP
-#
-$CMP OPAMP_SINGLE_NULL158
-D Single Opamp, Pins 1 and 5 and 8 Null, SOIC/DIP/SSOP/TO-99
-K single opamp
-$ENDCMP
-#
-$CMP OPAMP_SINGLE_SOT23
-D Single Opamp, SOT-23-5
-K single opamp
-$ENDCMP
-#
 $CMP Oscilloscope
 D Oscilloscope
 K Oscilloscope