name conflicts fixed