Try to be consistent across the names and the code