Class name change to reduce ambiguity
Change destination param in NewMap