(started) renaming some stuff to clearer names