Removed conflict naming