Adjustment to the class naming scheme.