renamed few internals of map_impl
renaming map internals
Merge branch 'renaming' into fixing-benchmarks