Rename vars to be less vague