Revert "Renaming for Mapping"

This reverts commit b4d63fd347aee2f6d3912c5da73c05a6e8c3e285.