diff --git a/pkg.in/lists/engineering/2d-cad b/pkg.in/lists/engineering/2d-cad
index 1d590dc1..7d631398 100644
--- a/pkg.in/lists/engineering/2d-cad
+++ b/pkg.in/lists/engineering/2d-cad
@@ -1,5 +1,2 @@
 # 2D CAD (Computer Aided Design)
-librecad
-qcad
-solvespace
-qelectrotech
+engineering-2D-CAD
diff --git a/pkg.in/lists/engineering/3d-cad b/pkg.in/lists/engineering/3d-cad
index db7fbe73..5feb3f26 100644
--- a/pkg.in/lists/engineering/3d-cad
+++ b/pkg.in/lists/engineering/3d-cad
@@ -1,8 +1,2 @@
 # 3D CAD (Computer Aided Design)
-freecad
-povray
-GLC_Player
-openscad
-openscad-MCAD
-openscad-libraries-mcad
-meshlab
+engineering-3D-CAD
diff --git a/pkg.in/lists/engineering/3d-printer b/pkg.in/lists/engineering/3d-printer
index 06e34b97..2cf47350 100644
--- a/pkg.in/lists/engineering/3d-printer
+++ b/pkg.in/lists/engineering/3d-printer
@@ -1,4 +1,2 @@
 # 3D Printer Software
-cura
-printrun
-repraptor
+engineering-3D-printing
diff --git a/pkg.in/lists/engineering/apcs b/pkg.in/lists/engineering/apcs
index 5b8da523..186c1e44 100644
--- a/pkg.in/lists/engineering/apcs
+++ b/pkg.in/lists/engineering/apcs
@@ -1,5 +1,2 @@
 # Advanced Process Control Software
-#beremiz
-#yaplc-ide # needed fix with new beremiz
-qmaster
-qslave
+engineering-APCS
diff --git a/pkg.in/lists/engineering/cam b/pkg.in/lists/engineering/cam
index a857f911..7e99f5b8 100644
--- a/pkg.in/lists/engineering/cam
+++ b/pkg.in/lists/engineering/cam
@@ -1,7 +1,3 @@
 # CAM (Computer-aided manufacturing)
 # and G-Code generators
-camotics
-pycam
-flatcam
-pcb2gcodeGUI
-rastercarve
+engineering-CAM
diff --git a/pkg.in/lists/engineering/cnc b/pkg.in/lists/engineering/cnc
index 3e89ba14..7627fdf2 100644
--- a/pkg.in/lists/engineering/cnc
+++ b/pkg.in/lists/engineering/cnc
@@ -1,3 +1,2 @@
 # CNC (Computer Numerical Control)
-linuxcnc
-mesaflash
+engineering-CNC
diff --git a/pkg.in/lists/engineering/eda b/pkg.in/lists/engineering/eda
index ed318450..9902db29 100644
--- a/pkg.in/lists/engineering/eda
+++ b/pkg.in/lists/engineering/eda
@@ -1,4 +1,2 @@
 # EDA (Electronic Design Automation)
-kicad
-qucs
-qucs-s
+engineering-EDA
diff --git a/pkg.in/lists/engineering/misc b/pkg.in/lists/engineering/misc
index 0981b208..2ed677f1 100644
--- a/pkg.in/lists/engineering/misc
+++ b/pkg.in/lists/engineering/misc
@@ -1,2 +1 @@
-cu
-cutecom
+engineering-misc