name changes and config fixes