ID field fix and name consistency.