Bug 1041186, Part 3: More renaming, r=keeler

--HG--
extra : rebase_source : e4d70240f25f566c3bde91d515739bf46853fe8d