rename files, remove legacy workaround