NAWQAAN-162

* Moved term name into object
* Added keys that are better for accessing definitions
* Added def to short and long to specify they are the definitions