Made some changes to file naming