Added functionality to allow modules to have underscores in their names