Convert UUID where needed
Fixes to config options implementation
Rename some things