Config and package name bugfixes