Refactoring the namespace for trigger points