name changes to avoid clashes