diff --git a/codec/SMPPBindTransceiver.st b/codec/SMPPBindTransceiver.st
index 7513447..29b731d 100644
--- a/codec/SMPPBindTransceiver.st
+++ b/codec/SMPPBindTransceiver.st
@@ -17,6 +17,8 @@
 "
 
 SMPPBindTransmitterBody subclass: SMPPBindTransceiver [
+    <category: 'SMPP-Codec'>
+
     SMPPBindTransceiver class >> messageType [
         ^self bindTransceiver
     ]
diff --git a/codec/SMPPBindTransmitterBody.st b/codec/SMPPBindTransmitterBody.st
index 4e8679b..506d907 100644
--- a/codec/SMPPBindTransmitterBody.st
+++ b/codec/SMPPBindTransmitterBody.st
@@ -18,6 +18,7 @@
 
 SMPPBodyBase subclass: SMPPBindTransmitterBody [
     | system_id password system_type version addr_ton addr_npi addr_range |
+    <category: 'SMPP-Codec'>
 
     SMPPBindTransmitterBody class >> messageType [
         ^self bindTransmitter
diff --git a/codec/SMPPBodyBase.st b/codec/SMPPBodyBase.st
index 7dd1f50..673ab3f 100644
--- a/codec/SMPPBodyBase.st
+++ b/codec/SMPPBodyBase.st
@@ -17,6 +17,7 @@
 "
 
 Osmo.TLVParserBase subclass: SMPPBodyBase [
+    <category: 'SMPP-Codec'>
     <comment: 'I represent a specific "BODY" of a Payload. My
 sub-classes will provide the specific bodies.'>
 
diff --git a/codec/SMPPEnquireLink.st b/codec/SMPPEnquireLink.st
index 34c442b..bc385f7 100644
--- a/codec/SMPPEnquireLink.st
+++ b/codec/SMPPEnquireLink.st
@@ -17,6 +17,7 @@
 "
 
 SMPPBodyBase subclass: SMPPEnquireLink [
+    <category: 'SMPP-Codec'>
 
     SMPPEnquireLink class >> messageType [
         ^self enquireLink
diff --git a/codec/SMPPGenericNack.st b/codec/SMPPGenericNack.st
index 0b0fb78..453c58e 100644
--- a/codec/SMPPGenericNack.st
+++ b/codec/SMPPGenericNack.st
@@ -17,6 +17,8 @@
 "
 
 SMPPBodyBase subclass: SMPPGenericNack [
+    <category: 'SMPP-Codec'>
+
     SMPPGenericNack class >> messageType [
         ^self genericNack
     ]
diff --git a/codec/SMPPMessage.st b/codec/SMPPMessage.st
index b9d0328..7094f3a 100644
--- a/codec/SMPPMessage.st
+++ b/codec/SMPPMessage.st
@@ -19,6 +19,8 @@
 Object subclass: SMPPMessage [
     | header body |
 
+    <category: 'SMPP-Codec'>
+
     SMPPMessage class >> readFrom: aStream [
         | len data stream header body |
         len := ((aStream next: 4) asByteArray uintAt: 1) swap32.
diff --git a/codec/SMPPPDUHeader.st b/codec/SMPPPDUHeader.st
index 25805d3..8e6bb01 100644
--- a/codec/SMPPPDUHeader.st
+++ b/codec/SMPPPDUHeader.st
@@ -18,7 +18,7 @@
 
 Object subclass: SMPPPDUHeader [
     | commandId commandStatus sequenceNumber |
-    <category: 'OsmoSMPP-Codec'>
+    <category: 'SMPP-Codec'>
     <comment: 'I represent a SMPPv3.4 SMPP PDU Header. E.g.
     3.2 of the SMPPv3.4 specification. The four byte lengths
     need to be written/read by someone else.'>
diff --git a/codec/SMPPSubmitSM.st b/codec/SMPPSubmitSM.st
index 05950bb..d3a80de 100644
--- a/codec/SMPPSubmitSM.st
+++ b/codec/SMPPSubmitSM.st
@@ -32,6 +32,8 @@ SMPPBodyBase subclass: SMPPSubmitSM [
       alert_on_msg_delivery language_indicator its_reply_type
       its_session_info ussd_service_op |
 
+    <category: 'SMPP-Codec'>
+
     SMPPSubmitSM class >> messageType [
         ^self submitSM
     ]
diff --git a/codec/SMPPUnbind.st b/codec/SMPPUnbind.st
index f4e23ac..b0f091a 100644
--- a/codec/SMPPUnbind.st
+++ b/codec/SMPPUnbind.st
@@ -17,6 +17,9 @@
 "
 
 SMPPBodyBase subclass: SMPPUnbind [
+
+    <category: 'SMPP-Codec'>
+
     SMPPUnbind class >> messageType [
         ^self unbind
     ]
diff --git a/codec/attributes/SMPPAddress.st b/codec/attributes/SMPPAddress.st
index ee7592d..7561c2f 100644
--- a/codec/attributes/SMPPAddress.st
+++ b/codec/attributes/SMPPAddress.st
@@ -17,6 +17,8 @@
 "
 
 SMPPOctetString subclass: SMPPAddress [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present an 5.2.8 attribute. It should be a IPv4
     address. IPv6 is not supported'>
 
diff --git a/codec/attributes/SMPPAddressNumberingPlanIndicator.st b/codec/attributes/SMPPAddressNumberingPlanIndicator.st
index ef05bc6..2c5b923 100644
--- a/codec/attributes/SMPPAddressNumberingPlanIndicator.st
+++ b/codec/attributes/SMPPAddressNumberingPlanIndicator.st
@@ -17,6 +17,8 @@
 "
 
 SMPPInteger subclass: SMPPAddressNumberingPlanIndicator [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present 5.2.6 of SMPPv3.4'>
 
     SMPPAddressNumberingPlanIndicator class [
diff --git a/codec/attributes/SMPPAddressRange.st b/codec/attributes/SMPPAddressRange.st
index 22b40f1..db47674 100644
--- a/codec/attributes/SMPPAddressRange.st
+++ b/codec/attributes/SMPPAddressRange.st
@@ -17,6 +17,8 @@
 "
 
 SMPPOctetString subclass: SMPPAddressRange [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present 5.2.7 of SMPPv3.4'>
 
     SMPPAddressRange class >> tlvDescription [
diff --git a/codec/attributes/SMPPAddressTypeOfNumber.st b/codec/attributes/SMPPAddressTypeOfNumber.st
index bf95dd7..91afebc 100644
--- a/codec/attributes/SMPPAddressTypeOfNumber.st
+++ b/codec/attributes/SMPPAddressTypeOfNumber.st
@@ -17,6 +17,8 @@
 "
 
 SMPPInteger subclass: SMPPAddressTypeOfNumber [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present 5.2.5 of SMPPv3.4'>
 
     SMPPAddressTypeOfNumber class [
diff --git a/codec/attributes/SMPPDataCoding.st b/codec/attributes/SMPPDataCoding.st
index fb0d370..fa6775a 100644
--- a/codec/attributes/SMPPDataCoding.st
+++ b/codec/attributes/SMPPDataCoding.st
@@ -17,6 +17,8 @@
 "
 
 SMPPInteger subclass: SMPPDataCoding [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I represent a 5.2.19'>
 
     SMPPDataCoding class >> tlvDescription [
diff --git a/codec/attributes/SMPPDefaultMessageId.st b/codec/attributes/SMPPDefaultMessageId.st
index 8f1cc81..401fad8 100644
--- a/codec/attributes/SMPPDefaultMessageId.st
+++ b/codec/attributes/SMPPDefaultMessageId.st
@@ -17,6 +17,8 @@
 "
 
 SMPPInteger subclass: SMPPDefaultMessageId [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present 5.2.20'>
 
     SMPPDefaultMessageId class >> tlvDescription [
diff --git a/codec/attributes/SMPPESMClass.st b/codec/attributes/SMPPESMClass.st
index f4e0326..7034913 100644
--- a/codec/attributes/SMPPESMClass.st
+++ b/codec/attributes/SMPPESMClass.st
@@ -17,6 +17,8 @@
 "
 
 SMPPInteger subclass: SMPPESMClass [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present a 5.2.12'>
 
     SMPPESMClass class [
diff --git a/codec/attributes/SMPPInteger.st b/codec/attributes/SMPPInteger.st
index 1000c97..fc9988b 100644
--- a/codec/attributes/SMPPInteger.st
+++ b/codec/attributes/SMPPInteger.st
@@ -17,6 +17,8 @@
 "
 
 Object subclass: SMPPInteger [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I help with the various kind of numbers'>
 
     SMPPInteger class >> tlvDescription [
diff --git a/codec/attributes/SMPPInterfaceVersion.st b/codec/attributes/SMPPInterfaceVersion.st
index b2dbee3..91a869a 100644
--- a/codec/attributes/SMPPInterfaceVersion.st
+++ b/codec/attributes/SMPPInterfaceVersion.st
@@ -17,6 +17,8 @@
 "
 
 SMPPInteger subclass: SMPPInterfaceVersion [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present 5.2.4 of SMPPv3.4'>
 
     SMPPInterfaceVersion class >> attrVersion34 [
diff --git a/codec/attributes/SMPPOctetString.st b/codec/attributes/SMPPOctetString.st
index 7ce11ec..d17d484 100644
--- a/codec/attributes/SMPPOctetString.st
+++ b/codec/attributes/SMPPOctetString.st
@@ -17,6 +17,8 @@
 "
 
 Object subclass: SMPPOctetString [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I represent a variable string as used in SMPP'>
 
     SMPPOctetString class >> tlvDescription [
diff --git a/codec/attributes/SMPPPassword.st b/codec/attributes/SMPPPassword.st
index 2c5d78c..82de43f 100644
--- a/codec/attributes/SMPPPassword.st
+++ b/codec/attributes/SMPPPassword.st
@@ -17,6 +17,8 @@
 "
 
 SMPPOctetString subclass: SMPPPassword [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I represent 5.2.2 of SMPPv3.4'>
 
     SMPPPassword class >> tlvDescription [
diff --git a/codec/attributes/SMPPPriorityFlag.st b/codec/attributes/SMPPPriorityFlag.st
index 217bdfc..ba50714 100644
--- a/codec/attributes/SMPPPriorityFlag.st
+++ b/codec/attributes/SMPPPriorityFlag.st
@@ -17,6 +17,8 @@
 "
 
 SMPPInteger subclass: SMPPPriorityFlag [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present 5.2.14 of SMPPv3.4. The range is 0 to 3 but
     the meaning depends on the type of message.'>
 
diff --git a/codec/attributes/SMPPProtocolId.st b/codec/attributes/SMPPProtocolId.st
index 7ebf7db..2669dbe 100644
--- a/codec/attributes/SMPPProtocolId.st
+++ b/codec/attributes/SMPPProtocolId.st
@@ -17,6 +17,8 @@
 "
 
 SMPPInteger subclass: SMPPProtocolId [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present a 5.2.13. But it refers to other things'>
 
     SMPPProtocolId class >> tlvDescription [
diff --git a/codec/attributes/SMPPRegisteredDelivery.st b/codec/attributes/SMPPRegisteredDelivery.st
index 42be6e6..652f803 100644
--- a/codec/attributes/SMPPRegisteredDelivery.st
+++ b/codec/attributes/SMPPRegisteredDelivery.st
@@ -17,6 +17,8 @@
 "
 
 SMPPInteger subclass: SMPPRegisteredDelivery [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present a 5.2.17'>
 
     SMPPRegisteredDelivery class >> tlvDescription [
diff --git a/codec/attributes/SMPPReplaceIfPresentFlag.st b/codec/attributes/SMPPReplaceIfPresentFlag.st
index f475719..8f75ddb 100644
--- a/codec/attributes/SMPPReplaceIfPresentFlag.st
+++ b/codec/attributes/SMPPReplaceIfPresentFlag.st
@@ -17,6 +17,8 @@
 "
 
 SMPPInteger subclass: SMPPReplaceIfPresentFlag [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present a 5.2.18 flag'>
 
     SMPPReplaceIfPresentFlag class [
diff --git a/codec/attributes/SMPPScheduleDeliveryTime.st b/codec/attributes/SMPPScheduleDeliveryTime.st
index 7d41bde..4d99887 100644
--- a/codec/attributes/SMPPScheduleDeliveryTime.st
+++ b/codec/attributes/SMPPScheduleDeliveryTime.st
@@ -17,6 +17,8 @@
 "
 
 SMPPOctetString subclass: SMPPScheduleDeliveryTime [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present a 5.2.15 field and can be NULL'>
 
     SMPPScheduleDeliveryTime class >> tlvDescription [
diff --git a/codec/attributes/SMPPServiceType.st b/codec/attributes/SMPPServiceType.st
index 37d03e3..ec30b0f 100644
--- a/codec/attributes/SMPPServiceType.st
+++ b/codec/attributes/SMPPServiceType.st
@@ -17,6 +17,8 @@
 "
 
 SMPPOctetString subclass: SMPPServiceType [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present a ServiceType as of 5.2.11'>
 
     SMPPServiceType class [
diff --git a/codec/attributes/SMPPShortMessage.st b/codec/attributes/SMPPShortMessage.st
index 5925ee2..d98ec5c 100644
--- a/codec/attributes/SMPPShortMessage.st
+++ b/codec/attributes/SMPPShortMessage.st
@@ -17,6 +17,8 @@
 "
 
 Object subclass: SMPPShortMessage [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I represent the sm_length and short_message'>
 
     SMPPShortMessage class >> tlvDescription [
diff --git a/codec/attributes/SMPPSystemId.st b/codec/attributes/SMPPSystemId.st
index aac190b..adabef9 100644
--- a/codec/attributes/SMPPSystemId.st
+++ b/codec/attributes/SMPPSystemId.st
@@ -17,6 +17,8 @@
 "
 
 SMPPOctetString subclass: SMPPSystemId [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present 5.2.1 of SMPPv3.4'>
 
     SMPPSystemId class >> tlvDescription [
diff --git a/codec/attributes/SMPPSystemType.st b/codec/attributes/SMPPSystemType.st
index 4447460..be52416 100644
--- a/codec/attributes/SMPPSystemType.st
+++ b/codec/attributes/SMPPSystemType.st
@@ -17,6 +17,8 @@
 "
 
 SMPPOctetString subclass: SMPPSystemType [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present 5.2.3 of SMPPv3.4'>
 
     SMPPSystemType class >> tlvDescription [
diff --git a/codec/attributes/SMPPValidityPeriod.st b/codec/attributes/SMPPValidityPeriod.st
index ffbdd61..dd97860 100644
--- a/codec/attributes/SMPPValidityPeriod.st
+++ b/codec/attributes/SMPPValidityPeriod.st
@@ -17,6 +17,8 @@
 "
 
 SMPPOctetString subclass: SMPPValidityPeriod [
+
+    <category: 'SMPP-Codec'>
     <comment: 'I represent a 5.2.16 validity period. I can be
 an empty string or contain 16 characters'>
 
diff --git a/codec/attributes/SMPPValueHolder.st b/codec/attributes/SMPPValueHolder.st
index 127ab58..d04265a 100644
--- a/codec/attributes/SMPPValueHolder.st
+++ b/codec/attributes/SMPPValueHolder.st
@@ -18,6 +18,8 @@
 
 Object subclass: SMPPValueHolder [
     | tag value |
+
+    <category: 'SMPP-Codec'>
     <comment: 'I re-present a general TLV kind of structure'>
 
     SMPPValueHolder class >> for: aString tag: aTag [
diff --git a/connection/Extensions.st b/connection/Extensions.st
index bdbe52c..b3e4135 100644
--- a/connection/Extensions.st
+++ b/connection/Extensions.st
@@ -18,12 +18,14 @@
 
 SMPPEnquireLink extend [
     connectionDispatchOn: aConnection with: aMessage [
+        <category: '*SMPP-Connection'>
         aConnection respondToEnquire: aMessage
     ]
 ]
 
 SMPPBindTransceiverResponse extend [
     connectionDispatchOn: aConnection with: aMessage [
+        <category: '*SMPP-Connection'>
         aConnection receviedResponse: aMessage
     ]
 ]
diff --git a/test/SMPPMessageTest.st b/test/SMPPMessageTest.st
index 6d40fc2..ab7fe87 100644
--- a/test/SMPPMessageTest.st
+++ b/test/SMPPMessageTest.st
@@ -17,7 +17,7 @@
 "
 
 TestCase subclass: SMPPMessageTest [
-    <category: 'OsmoSMPP-Test'>
+    <category: 'SMPP-Codec-Test'>
     <comment: 'I test reading and writing most of the SMPP header and body'>
 
     examplePdu [
diff --git a/test/SMPPPDUHeaderTest.st b/test/SMPPPDUHeaderTest.st
index c11e836..24cb9d1 100644
--- a/test/SMPPPDUHeaderTest.st
+++ b/test/SMPPPDUHeaderTest.st
@@ -17,7 +17,7 @@
 "
 
 TestCase subclass: SMPPPDUHeaderTest [
-    <category: 'OsmoSMPP-Test'>
+    <category: 'SMPP-Codec-Test'>
     <comment: 'I test reading and writing most of the SMPP header.'>
 
     testParse [