Change to follow abbreviation case convention of class name