Removed ambiguity with module names