Fix some property names.
Add some abstract data types.