Refactored Packet code to original naming