Refactor: Use clearer naming

Change-Id: I70287dbfa2e5bf997e3e0c2214bc06202d79792e