renamed a bunch of stuff to schema