Naming cleanup, still a lot to do...