Rename Variables to make a bit more sense