Fixed minor errors: Map name is now unique