More language changes to get better consistency.