Naming cleanup, test cleanup