Style fixes.
Classes renaming.