file names related changes, bugs removed

Merged Sandeep S. Shewalkar requested to merge ss_dev_Branch into stagingbranch