diff --git a/eclass/nas-kernel.eclass b/eclass/nas-kernel.eclass
index 5f28d8f..b8a31b7 100644
--- a/eclass/nas-kernel.eclass
+++ b/eclass/nas-kernel.eclass
@@ -515,12 +515,12 @@ _kernel_src_compile() {
 	# so the old ls_pro_live has to be split to ls_pro ls_live
 	# for now let it stay but a move schould be done to ls_pro
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_kb_pro" ]; then
-		devio > foo 'wl 0xe3a01c05,4' 'wl 0xe38110e5,4' # KuroBox Pro
+		devio > foo 'wl 0xe3a01c05,4' 'wl 0xe38110e5,4' # KuroBox Pro 1509
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo/Revogear Kurobox Pro"
 	fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_chl" ]; then
-		devio > foo 'wl 0xe3a01c0B,4' 'wl 0xe3811061,4' # Linkstation Live V3 (2.6.34)
+		devio > foo 'wl 0xe3a01c0b,4' 'wl 0xe3811061,4' # Linkstation Live V3 (2.6.34) 2913
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo Linkstation LiveV3 (LS-CHL)"
 	fi
@@ -535,37 +535,37 @@ _kernel_src_compile() {
 		K_NASKERNEL_DEVICE="Buffalo Linkstation LS-CHLv2"
 	fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_hgl" ]; then
-		devio > foo 'wl 0xe3a01c07,4' 'wl 0xe38110d5,4' # Linkstation HGL (2.6.31)
+		devio > foo 'wl 0xe3a01c07,4' 'wl 0xe38110d5,4' # Linkstation HGL (2.6.31) 2005
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo Linkstation LS-HGL"
 	fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_live" ]; then
-		devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811031,4' # Linkstation Pro/Live (2.6.26)
+		devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811031,4' # Linkstation Pro/Live (2.6.26) 1585
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo Linkstation Pro/Live"
 	fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_mini" ]; then
-		devio > foo 'wl 0xe3a01c07,4' 'wl 0xe3811042,4' # Linkstation mini (2.6.29)
+		devio > foo 'wl 0xe3a01c07,4' 'wl 0xe3811042,4' # Linkstation mini (2.6.29) 1858
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo Linkstation Mini"
 	fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_pro" ]; then
-		devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811031,4' # Linkstation Pro/Live (2.6.26)
+		devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811031,4' # Linkstation Pro/Live (2.6.26) 1585
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo Linkstation Pro/Live"
 	fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_pro_duo_rev1" ]; then
-		devio > foo 'wl 0xe3a01c07,4' 'wl 0xe3811027,4' # Linkstation Pro Duo (2.6.30)
+		devio > foo 'wl 0xe3a01c07,4' 'wl 0xe3811027,4' # Linkstation Pro Duo (2.6.30) 1831
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo Linkstation Pro Duo - Revision 1"
 	fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_pro_duo_rev2" ]; then
-		devio > foo 'wl 0xe3a01c07,4' 'wl 0xe3811027,4' # Linkstation Pro Duo (2.6.30)
+		devio > foo 'wl 0xe3a01c07,4' 'wl 0xe3811027,4' # Linkstation Pro Duo (2.6.30) 1831
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo Linkstation Pro Duo - Revision 2"
 	fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_ql" ]; then
-		devio > foo 'wl 0xe3a01c10,4' 'wl 0xe381108e,4' # Buffalo Linkstation Quad LSQL. Registered 2012.06.15.  
+		devio > foo 'wl 0xe3a01c10,4' 'wl 0xe381108e,4' # Buffalo Linkstation Quad LSQL. Registered 2012.06.15. 4238
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo Linkstation Quad"
 	fi
@@ -579,8 +579,8 @@ _kernel_src_compile() {
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo Linkstation LS-XHL"
 	fi
-	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_wxl" ]; then
-		devio > foo 'wl 0xe3a01c0b,4' 'wl 0xe38110c4,4' # Linkstation WXL (2.6.35)
+	if [ "${K_NASKERNEL_NAME}" = "buffalo_ts_wxl" ]; then
+		devio > foo 'wl 0xe3a01c0a,4' 'wl 0xe3811089,4' # Terastation WXL (2.6.35) 2697
 		K_NASKERNEL_TYPE="buffalo"
 		# Broken hardware name needs to be correct in u-boot firmware
 		K_NASKERNEL_DEVICE="Buffalo Linkstation Pro/Live"
@@ -590,7 +590,7 @@ _kernel_src_compile() {
 			# new Device tree no need for devio
 			K_NASKERNEL_DTB="kirkwood-lsxhl.dtb"
 		else
-			devio > foo 'wl 0xe3a01c0a,4' 'wl 0xe3811067,4' # Linkstation XHL/CHLv2 (2.6.30)
+			devio > foo 'wl 0xe3a01c0a,4' 'wl 0xe3811067,4' # Linkstation XHL/CHLv2 (2.6.30) 2663
 		fi
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo Linkstation LS-XHL"