converted snake case to camel case in consistent places
removed goals from trigger view