Code reformatting. Renaming some fields and methods.
Fixes.