Fixing uniquename problem with prefices/suffices