Rename hook subscriber

Swap global function for closure

Change-Id: I41a17461546ac76e223db1c2dc5b2be1ff093af8