Feature/nameconflict