Changed name of configuration files
Merged