Rename class vars