rename files
applied stomar's review