change confliced naming