Stick to one naming convention