Rename some fields, fixes for golint. Fix cascade of changes.