Update definitions to reflect new EC
Various typos