Fix namespace conflict

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