rename modifed files to allow for git merge from upstream/master JCW