Renaming some classes plus other changes.