Rename NovaCompute resources suffix to be consistent with controller

This change renames a few NovaCompute resources so that the naming
is consistent with the controller resources naming choice.

Change-Id: I8c22867b208c5e16fd52bb3157f838f762b71470
Merge "Rename NovaCompute resources suffix to be consistent with controller"