Yes, I am referring to your second example, which is pretty much the universally used symbol now.
The distinction of the arrow being on the source or body is not one that I knew about, I only know that for an NPN transistor the arrows points out and for the NMOS transistor it points in, which...