rename files to conform with naming conventions