Follow naming convention more closely