More on naming convention