Replace  in class names with  to better reflectlanguage usage.