diff --git a/classes/zephyrtest.bbclass b/classes/zephyrtest.bbclass
index e396bf7..1b321de 100644
--- a/classes/zephyrtest.bbclass
+++ b/classes/zephyrtest.bbclass
@@ -1,23 +1,22 @@
 
 python zephyrtest_virtclass_handler () {
-    cls = e.data.getVar("BBEXTENDCURR", True)
     variant = e.data.getVar("BBEXTENDVARIANT", True)
 
     # ipk doesn't like underscores in pacakges names. So just use dashes
     # for PN and the image name.
     variant_dashes = variant.replace('_', '-')
 
-    pn = e.data.getVar("PN", True) + "-" + variant_dashes
+    pn = variant_dashes
     pn_underscores = e.data.getVar("PN", True) + "-" + variant
 
     e.data.setVar("PN", pn)
-    e.data.setVar("ZEPHYR_IMAGENAME", variant_dashes + ".elf")
+    e.data.setVar("ZEPHYR_IMAGENAME", pn + ".elf")
 
     # Most tests for Zephyr 1.6 are in the "legacy" folder
     e.data.setVar("ZEPHYR_IMAGE_SRCDIR", "tests/legacy/kernel/" + variant)
     e.data.setVar("ZEPHYR_MAKE_OUTPUT", "zephyr.elf")
 
-    # Allow to build using both foo-some_test form as well ass foo-some-test
+    # Allow to build using both foo-some_test form as well as foo-some-test
     e.data.setVar("PROVIDES", e.data.getVar("PROVIDES", True) + pn_underscores)
 }