name change and event fix