ID#234: renaming to avoid technical or type declaration in class names.