ID and spelling fixes for model content