added necessary fixes as for previous file name change commit.