Class name changes (removing wk- prefix)