Revert "Simplified the call structure of the `validate' label while validating locations"

This reverts commit bbc6ea37e4cd24ec6cf0bf5a71b2d71d2f7a4450.
Refactored hook namespaces for logging