added event for killing heartbeat and adjust camel case names