Try renaming to avoid name clashes