Change naming and composition of the MapFragment