Changes to terminology to facilitate better architecture internally.