Updated map and value identifiers across the project.