Tweak variable and method names.