diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f05f59c..c8738d73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,11 +204,7 @@ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 # Set Package Name
 # Initialize CPACK_COMPONENTS_ALL with common components
 set(CPACK_COMPONENTS_ALL jfjoch writer)
-if (SLS9)
-    set(CPACK_PACKAGE_NAME "jfjoch-slsdet9")
-else()
-    set(CPACK_PACKAGE_NAME "jfjoch")
-endif()
+set(CPACK_PACKAGE_NAME "jfjoch")
 
 # Add optional components
 if (JFJOCH_INSTALL_DRIVER_SOURCE)
@@ -234,7 +230,7 @@ if (EXISTS "/etc/debian_version")
     # Debian/Ubuntu: .deb with components
     set(CPACK_GENERATOR "DEB")
     set(CPACK_DEB_COMPONENT_INSTALL ON)
-    set(CPACK_DEBIAN_MAIN_COMPONENT jfjoch)
+    set(CPACK_DEBIAN_MAIN_COMPONENT broker)
     set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
 
     # Enable automatic shlib dependency discovery