Renaming and implementation classes