Autimatic map naming option added