renaming some variables. moar tests