Fixed bugs due to renaming of files