Fixed some name-ID mapping problems.