Rename files and annotaiton test