Filename and class name changes