Changed name on spring property file
Merged