Naming cleanup, minor problems.