Make class naming convention consistent.