Naming changes and small bugfixes