Fix problem with class name conflicts