Variable naming refactors.