Change socket references to this