diff --git a/weekly/app-cdr.particle b/weekly/app-cdr.particle
index 21d9908..bddb34c 100644
--- a/weekly/app-cdr.particle
+++ b/weekly/app-cdr.particle
@@ -17,7 +17,7 @@ packages:
 	app-cdr/ccd2iso,
 	app-cdr/cdck,
 	app-cdr/cdemu,
-	app-cdr/cdemud,
+	app-cdr/cdemu-daemon,
 	app-cdr/cdlabelgen,
 	app-cdr/cdrdao,
 	app-cdr/cdrtools,
diff --git a/weekly/app-vim.particle b/weekly/app-vim.particle
index 0b5fced..8deba97 100644
--- a/weekly/app-vim.particle
+++ b/weekly/app-vim.particle
@@ -13,7 +13,7 @@ packages:
 	app-vim/bnf-syntax,
 	app-vim/brainfuck-syntax,
 	app-vim/breakpts,
-	app-vim/bufferexplorer,
+	app-vim/bufexplorer,
 	app-vim/c-support,
 	app-vim/calendar,
 	app-vim/cctree,
diff --git a/weekly/dev-haskell.particle b/weekly/dev-haskell.particle
index ad81503..ccb1bf1 100644
--- a/weekly/dev-haskell.particle
+++ b/weekly/dev-haskell.particle
@@ -58,7 +58,7 @@ packages:
 	dev-haskell/hsql-mysql,
 	dev-haskell/hsql-odbc,
 	dev-haskell/hsql-postgresql,
-	dev-haskell/hsql-sqlite,
+	dev-haskell/hsql-sqlite3,
 	dev-haskell/html,
 	dev-haskell/http,
 	dev-haskell/hunit,
diff --git a/weekly/dev-util.stable.particle b/weekly/dev-util.stable.particle
index d02d49a..ca967ff 100644
--- a/weekly/dev-util.stable.particle
+++ b/weekly/dev-util.stable.particle
@@ -168,7 +168,7 @@ packages:
 	dev-util/premake:0,
 	dev-util/pykickstart:0,
 	dev-util/qdevelop:0,
-	dev-util/qt-creator:0,
+	dev-qt/qt-creator:0,
 	dev-util/quilt:0,
 	dev-util/ragel:0,
 	dev-util/rats:0,
diff --git a/weekly/media-fonts.particle b/weekly/media-fonts.particle
index db14f8b..4b58e3f 100644
--- a/weekly/media-fonts.particle
+++ b/weekly/media-fonts.particle
@@ -74,7 +74,7 @@ packages:
 	media-fonts/font-winitzki-cyrillic,
 	media-fonts/font-xfree86-type1,
 	media-fonts/free-bangla-font,
-	media-fonts/freefont-ttf,
+	media-fonts/freefont,
 	media-fonts/freefonts,
 	media-fonts/fs-fonts,
 	media-fonts/heuristica,
diff --git a/weekly/net-wireless.particle b/weekly/net-wireless.particle
index 23b6734..3832abb 100644
--- a/weekly/net-wireless.particle
+++ b/weekly/net-wireless.particle
@@ -4,21 +4,21 @@
 # Comma separated, example: app-foo/bar, bar-baz/foo
 # Mandatory, cannot be empty
 packages:
-	net-wireless/atmel-firmware,
+	sys-firmware/atmel-firmware,
 
-	net-wireless/b43-firmware
+	sys-firmware/b43-firmware
 	net-wireless/b43-fwcutter,
 
 	net-wireless/bcm43xx-firmware,
-	net-wireless/bluez-firmware,
-	net-wireless/ipw2100-firmware,
-	net-wireless/ipw2200-firmware,
+	sys-firmware/bluez-firmware,
+	sys-firmware/ipw2100-firmware,
+	sys-firmware/ipw2200-firmware,
 	net-wireless/prism54-firmware:0,
 	net-wireless/prism54-firmware:1,
 	net-wireless/rtl8192su-firmware,
 	net-wireless/wpa_supplicant,
-	net-wireless/zd1201-firmware,
-	net-wireless/zd1211-firmware,
+	sys-firmware/zd1201-firmware,
+	sys-firmware/zd1211-firmware,
 
 
 # Entropy repository where to commit packages
diff --git a/weekly/x11-libs.particle b/weekly/x11-libs.particle
index a6cdef0..dc35393 100644
--- a/weekly/x11-libs.particle
+++ b/weekly/x11-libs.particle
@@ -74,21 +74,21 @@ packages:
 	x11-libs/pangox-compat:0,
 	x11-libs/pixman:0,
 	x11-libs/qscintilla:0,
-	x11-libs/qt-assistant:4,
-	x11-libs/qt-core:4,
-	x11-libs/qt-dbus:4,
-	x11-libs/qt-declarative:4,
-	x11-libs/qt-demo:4,
-	x11-libs/qt-gui:4,
-	x11-libs/qt-multimedia:4,
-	x11-libs/qt-opengl:4,
-	x11-libs/qt-qt3support:4,
-	x11-libs/qt-script:4,
-	x11-libs/qt-sql:4,
-	x11-libs/qt-svg:4,
-	x11-libs/qt-test:4,
-	x11-libs/qt-webkit:4,
-	x11-libs/qt-xmlpatterns:4,
+	dev-qt/qthelp:4,
+	dev-qt/qtcore:4,
+	dev-qt/qtdbus:4,
+	dev-qt/qtdeclarative:4,
+	dev-qt/qtdemo:4,
+	dev-qt/qtgui:4,
+	dev-qt/qtmultimedia:4,
+	dev-qt/qtopengl:4,
+	dev-qt/qt3support:4,
+	dev-qt/qtscript:4,
+	dev-qt/qtsql:4,
+	dev-qt/qtsvg:4,
+	dev-qt/qttest:4,
+	dev-qt/qtwebkit:4,
+	dev-qt/qtxmlpatterns:4,
 	x11-libs/qtscriptgenerator:0,
 	x11-libs/qtstatemachine:4,
 	x11-libs/qwt:5,