Stick with naming conventions