Fix config and add names