Rename some file

Also try again at the transition spec macro
still failing