Cleanup the config files
Use better names for wrappers