Make field names consistent
Merge branch 'master' of github.com:anchor/umad