Removed not necessary part of the name
Resolving conflict