cdb_map: fix some function naming issues