renamed a bunch of variables