Change method names to remove [Hooks] reference now that this is separated out - there doesn't need to be this duplicitous 'clarity' given the classes are now separate