[TASK] Update hook definitions to new namespace classes