Avoid name clashing when including modules

@radar that's already there, actually.