Refactoring from protocol to net package naming.