Fix naming to fit wireshark naming conventions