Fixed parsing problems

I missed some case-sensitive parts to this and had to change the Data
Contracts to match.  This means tab names now work properly.