Issue #2305071 by ChrisjuhB: YAML files renamed.