renaming of several classes and interfaces