Renaming

Ranemd a few variables to make there meanings seem more fitting.