Fixed Naming Conflicts