Refactor tracking calls which used the eventName param.