Use proper naming convention for config blocks

This allows address config to be overridden with before / after priority arguments. The config parser does not accept spaces.