Added notes for troublesome names