New loch map scrapped over offensive name changes