Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.520 -r1.521
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	17 May 2018 07:35:53 -0000	1.520
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	17 May 2018 14:02:52 -0000	1.521
@@ -3370,15 +3370,8 @@
     } else {
       set name ""
     }
-    set CSSname [:name]
-
-    # Remove language prefix, if used.
-    regexp {^..:(.*)$} $CSSname _ CSSname
-
-    # Remove "file extension", since dot's in CSS class names do not
-    # make much sense.
-    regsub {[.].*$} $CSSname "" CSSname
-    return [append name "Form-$CSSname"]
+    
+    return [append name [::xowiki::utility formCSSclass [:name]]]
   }
 
   #