Some name conflict resolution and other fixes
Resolve conflicts