Updated Map* Remade some names