Merge "Cleanup naming conventions for CPS-NCMP"