Tighten IncomeType element names. Define terms