Change rpc_mount_* to rpc_mount3_* and make it explicit which version of