Naming to improve debugging