minor warning fixes
rename to cpp
fix build after rename
rename to cpp
fix up after rename