sprint has hijacked my hero! (not really but...)

ok so i have done a little research and a little homework, and even some trial and error and been able to get no where.

since flashing my rom and installing the gapps. i have noticed sprint has apparently hijacked my phone (not literally of course.)

my notifications window and carrier id on lockscreen all went to Sprint. This was a really easy fix (thanks to asmith on this forum).

i noticed that the downloads tab in my market app. suddenly says Sprint. i screwed around with it for a little while and cleared the app data, reloaded the market and voila! there was my market tab. this victory was short lived.

today i open my market app again only to discover that sprint is really really trying to get me to leave Cell South (again, not literally) and has once again hijacked my market app and stolen my downloads tab in lieu of their Sprint tab.

so i did some more looking. using a root explorer i managed to find this file /system/build.prop there are some notable entries here:

ro.build.brand=sprint
ro.com.google.clientidbase=android-sprint-us
ro.cdma.home.operator.numeric=310120
ro.cdma.home.operator.alpha=Sprint

towards the bottom of the file there is the following entry that seems to conflict with the above entry

ro.com.google.clientidbase=android-google

can i change these entries on my own? is it possible to just comment them out entirely?