Rename fields to current naming conventions
Rename fields to current naming conventions

Also, fix NPE in description_complexity
Inventitech/travis-analysis,Inventitech/travis-analysis,Inventitech/travis-analysis