Merge pull request #529 from jonohart/arpnames

Fixed variable names and javadoc left over from old code, and removed the ArpMessage class