diff -r 08cd5a0c967e -r 8140ba8c005b javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Tue Jan 22 09:19:47 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Tue Jan 22 19:27:00 2013 +0100
@@ -160,11 +160,17 @@
         if (tag.equals("input")) {
             return "Input";
         }
+        if (tag.equals("canvas")) {
+            return "Canvas";
+        }
+        if (tag.equals("img")) {
+            return "Image";
+        }
         return "Element";
     }
 
     private static String cnstnt(String id) {
-        return id.toUpperCase(Locale.ENGLISH).replace('.', '_');
+        return id.toUpperCase(Locale.ENGLISH).replace('.', '_').replace('-', '_');
     }
 
     private boolean initializeOnClick(