Fixing Sonar issues, focusing mainly on renaming constant names.

Change-Id: I830c18c49e6d401d6ab5162b075f8e5e9713d773
Signed-off-by: ebrjohn <brady.allen.johnson@ericsson.com>