Fixed an integration issue with module naming.
Fixed more integration issues.