fixed class/files names