Fix namespace conflict

That refactoring caused namespace conflicts with. My commit fixes it.

BR,
Simon