Cleanup naming conventions for CPS-NCMP

Change naming conventions in CPS-NCMP project

Issue-ID: CPS-626
Change-Id: Ie97c53ef50eb3d0947136db0606047150181ec1b
Signed-off-by: DylanB95EST <dylan.byrne@est.tech>
7 files changed