More table fixes. Naming conventions on type 'Expense' and 'Feature' used to differentiate features form expenses.