Module name and class name changes