Add comments and source of names.