Rename classes
Rename classes