// Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
-#ifndef ICMPCHECKSUMCALCULATOR_H
-#define ICMPCHECKSUMCALCULATOR_H
+#ifndef ICMP_CHECKSUM_H
+#define ICMP_CHECKSUM_H
 
 #include "host/checksum.hpp"
 #include "icmp/icmpdata.h"
 
 //-----------------------------------------------------------------------------
-// IcmpChecksumCalculator
+// IcmpChecksum
 //-----------------------------------------------------------------------------
 
-typedef Checksum<IcmpData::const_iterator> IcmpChecksumCalculator;
+typedef Checksum<IcmpData::const_iterator> IcmpChecksum;
 
-#endif /* ICMPCHECKSUMCALCULATOR_H */
+#endif // ICMP_CHECKSUM_H
 
 
 #include <logfunc.hpp>
 
-#include "icmp/icmpchecksumcalculator.h"
+#include "icmp/icmpchecksum.h"
 #include "icmp/icmpdata.h"
 #include "icmp/icmpheader.h"
 #include "icmp/icmppacket.h"
 
     IcmpType type = IcmpType_EchoRequest;
     uint8_t code = 0;
-    IcmpChecksumCalculator calculator( icmp_data.begin(), icmp_data.end() );
+    IcmpChecksum calculator( icmp_data.begin(), icmp_data.end() );
     uint16_t checksum = calculator.compute(
             type, code, Identifier, sequence_number
     );