Changed module names to contain underscores