Fix incorrect slugs

Pivotal tickets:

- https://www.pivotaltracker.com/story/show/59541766
- https://www.pivotaltracker.com/story/show/54280488