#449 Apply location name fix elsewhere as well.

2 jobs for 449-extend-cast-checks in 0 seconds (queued for 30 seconds)