fixed config bug, more renaming