Oops! You're both right.

As a substitution, p^2=m^2v^2 does work

I was thinking more along the line of pzkpfw's post.