just removing some indirection that was using two identical sets of names to refer to the same things