a lot of renaming files and corresponding fixes