Fixed double firing event rename new name/comp