correct refactoring for namur