refactor naming in config