Rename event name for retries
Python3 compat fix in model translation