survey work and class renaming