slight modification to make references from views to models more uniform