change names
finish renaming of files and classes