Name-based URL clash
Name-based URL clash fix