Fixed name of config files for auto generation.
Merge branch 'test' into dev