Refactored the packet class names