Style fixes (renaming many methods)