Review and normalize naming in conf