some changes on filenames and trying to make more readable but failed