Rename a few files which are used in QVM code ad fix up.