Refactored packet names