More class renames to avoid clashes.