Clean-up packet socket naming
21 files changed