More class naming convention changes