rename a bunch of things to be more concise