Rename mapState.js to urlState.js
Update old mapState references
Merge branch 'topic/url-state'