Rationalizing routine names of some recently added functions.

Still in progress, but I don't think I broke anything.