Fix recent changes to private class naming.