Change modulename to reflect class names.