Rename class members to include _ in end