Fixes issue with ng names duplicates

Fixes: bug #1202732

Change-Id: I105812e4dd01525a0499c4085568ee8e5c13ad3a
(cherry picked from commit f8e99c669045e8ea1a00f86eaa9fdc1cc87e4666)