Rename classes and methods