[CLEANUP] Further improve variable and method names.