When part of Nova, many files were named in such a way as to indicate
that they were separate from the nova files that did the same thing. Now
that that distinction is no longer needed, we can rename them to sound
more natural.
Additionally, references to these file names in other parts of the code
have been updated.
Change-Id: Id4439b4af827b64bbac213085ac74d1283c96db0
5794b857b4