Variable renaming to make a bit more sense