Naming and logging cleanup