ported unique_non_deleted name logic to module