Rename remote socket handlers
Fix missing typeof