Move names to toplevel namespace