Improve naming and tidy up.
Improve naming and tidy up.

[#90093610]

shashidharatd/garden-linux,shashidharatd/garden-linux,cloudfoundry-incubator/garden-linux,shashidharatd/garden-linux,cloudfoundry-incubator/garden-linux,shashidharatd/garden-linux,cloudfoundry-incubator/garden-linux