Renaming Map Control

Closes #205