use* names abstraction
Test for sortname when no use* names are defined
Removed variants from dev branch
Horrible merge from removing variants in DEV branch