Unqualified names

removed a bunch of name qualifications where it wasn't really needed