Rename some fields and make location a sub-doc for now