Fix the place naming conventions, and fix the transitions