Put the original id names back. They are important for remote connections