primary name

[andrei_c]

I'll try to do something about it in 6.0.? update.

Andrei