Fixes.
Renaming fields.