moving more names into the local configs