class naming change.