Rename

Variables renamed to be slightly more readable