renamed a bunch of crap to make it more logical