Survey: Rename Model classes to avoid conflicts (survey_translate wasn't loading with load_all_models()), also do some cleanup
Stdise comment for model returns