Give a default name when a class does not have one.
Minor adjustments.