Name changes & minor refactorings for clarity.