Change names to match styleguide
Fix javascript naming error in routes