Naming and flow cleanup