simplify config handling
harmonize config name