improved another defaults/naming conflict