Rename classes for properties