Comments, and revert making mapping stuff public
Rename C methods and util classes