Fixes for creating domains and configuration
Some renaming
Renamed