Cleanup and renamed event to match existing events