NEXUS-5912: returning names

As all the ITs are relying on those.