The old Media Server is now called Library Server.
The new Media Server is a shell that is a small footprint version of MC. It can listen for requests for the servers.
The Media Server that runs on the NAS could be anything, but it's unlikely that it will work with MC. MC could just import the NAS files though.