New cxxcam nef -> geom

Rename to match cxxcam.