[BUGFIX] Adjust hooks after moving/namespacing