Naming and code cleanup