More general naming. Simplify config.