Distinct identifiers

Renamed identifier_name to route_identifier_name to better describe what an identifier is.

This PR is part of a group of PRs and should not be merged independently.

This PR is the 'master' PR of this collection of PRs.