Rename vars for readability