Issue #189: Class renaming.