modefy class names and file names