In the Emacs 24.5 release there is an option to use network name as the
buffer name. Can you install this version and see if it solves the issue?
I'm still not quite sure where what your issue is specifically, where
you're seeing the problem exactly

Thanks