change conflicting name