Lists in general are great for organizing thoughts. Being able to check items off the list helps focus thoughts and offload the overhead of keeping track of progress to something better suited to the task.
In that case you'd need to either force the next push because squashing rewrites history or use a separate branch to do the renames in the first place.
Which doesn't have to be a terrible idea. Explicitly encouraging transit app competition is great.
Now if only you could change the default handler for addresses to route to other mapping/direction programs. Once we get that, this teapot tempest will die out.
Carriers already push iPhone alternatives for all sorts of reasons. It doesn't matter how good the third-party transit apps are. Not having transit routing built in is an "instant demo" for any carrier sales rep trying to push an Android or Windows Phone. And, last I heard, Apple sells far more iPhones through carriers that they sell directly...