Duplicate name fix [MJ-391]

All tests pass