Mrafsan/chore/modify duplicate name