[legibility] Rename variables/methods so they make more sense