Tweak hooks and naming