Avoid name clashing when including modules

@xjunior And even with that you're seeing this behaviour?