diff --git a/jacd.c b/jacd.c
index 0970520..aa5898f 100644
--- a/jacd.c
+++ b/jacd.c
@@ -175,14 +175,14 @@ static int parse_range(char *str)
 /* j1939 socket */
 static const struct j1939_filter filt[] = {
 	{
-		.pgn = 0x0ee00,
-		.pgn_mask = 0x3ff00,
+		.pgn = J1939_PGN_ADDRESS_CLAIMED,
+		.pgn_mask = J1939_PGN_PDU1_MAX,
 	}, {
-		.pgn = 0x0ea00,
-		.pgn_mask = 0x3ff00,
+		.pgn = J1939_PGN_REQUEST,
+		.pgn_mask = J1939_PGN_PDU1_MAX,
 	}, {
 		.pgn = 0x0fed8,
-		.pgn_mask = 0x3ffff,
+		.pgn_mask = J1939_PGN_MAX,
 	},
 };
 
@@ -195,7 +195,7 @@ static int open_socket(const char *device, uint64_t name)
 		.can_addr.j1939 = {
 			.name = name,
 			.addr = J1939_IDLE_ADDR,
-			.pgn = 0x0ee00,
+			.pgn = J1939_NO_PGN,
 		},
 		.can_ifindex = if_nametoindex(s.intf),
 	};
@@ -260,7 +260,7 @@ static int claim_address(int sock, uint64_t name, int sa)
 		.can_addr.j1939 = {
 			.name = name,
 			.addr = sa,
-			.pgn = 0x0ee00,
+			.pgn = J1939_NO_PGN,
 		},
 		.can_ifindex = if_nametoindex(s.intf),
 	};
@@ -280,7 +280,7 @@ static int request_addresses(int sock)
 	int ret;
 	static const struct sockaddr_can saddr = {
 		.can_family = AF_CAN,
-		.can_addr.j1939.pgn = 0x0ea00,
+		.can_addr.j1939.pgn = J1939_PGN_REQUEST,
 		.can_addr.j1939.addr = J1939_NO_ADDR,
 	};
 
@@ -569,11 +569,11 @@ int main(int argc, char *argv[])
 			error(1, errno, "recvfrom()");
 		}
 		switch (saddr.can_addr.j1939.pgn) {
-		case 0x0ea00:
+		case J1939_PGN_REQUEST:
 			if (ret < 3)
 				break;
 			pgn = dat[0] + (dat[1] << 8) + ((dat[2] & 0x03) << 16);
-			if (pgn != 0x0ee00)
+			if (pgn != J1939_PGN_ADDRESS_CLAIMED)
 				/* not interested */
 				break;
 			if (s.state == STATE_REQ_SENT) {
@@ -587,7 +587,7 @@ int main(int argc, char *argv[])
 					schedule_itimer(50);
 			}
 			break;
-		case 0x0ee00:
+		case J1939_PGN_ADDRESS_CLAIMED:
 			if (saddr.can_addr.j1939.addr >= J1939_IDLE_ADDR) {
 				sa = lookup_name(saddr.can_addr.j1939.name);
 				if (sa < J1939_IDLE_ADDR)
diff --git a/jspy.c b/jspy.c
index 55ddeb7..5764be5 100644
--- a/jspy.c
+++ b/jspy.c
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
 		filt.addr_mask = ~0;
 		++filter;
 	}
-	if (s.addr.can_addr.j1939.pgn <= 0x3ffff) {
+	if (s.addr.can_addr.j1939.pgn <= J1939_PGN_MAX) {
 		filt.pgn = s.addr.can_addr.j1939.pgn;
 		filt.pgn_mask = ~0;
 		++filter;
diff --git a/libj1939.c b/libj1939.c
index 9bb6fe5..002bebd 100644
--- a/libj1939.c
+++ b/libj1939.c
@@ -183,13 +183,13 @@ const char *libj1939_addr2str(const struct sockaddr_can *can)
 	}
 	if (can->can_addr.j1939.name) {
 		str += sprintf(str, "%016llx", (unsigned long long)can->can_addr.j1939.name);
-		if (can->can_addr.j1939.pgn == 0x0ee00)
+		if (can->can_addr.j1939.pgn == J1939_PGN_ADDRESS_CLAIMED)
 			str += sprintf(str, ".%02x", can->can_addr.j1939.addr);
 	} else if (can->can_addr.j1939.addr <= 0xfe)
 		str += sprintf(str, "%02x", can->can_addr.j1939.addr);
 	else
 		str += sprintf(str, "-");
-	if (can->can_addr.j1939.pgn <= 0x3ffff)
+	if (can->can_addr.j1939.pgn <= J1939_PGN_MAX)
 		str += sprintf(str, ",%05x", can->can_addr.j1939.pgn);
 
 	return buf;