Make naming convention consistent