changed a few module names
changed a few module names