Modify naming convention