Rename classes and functions