Removed name conflict