treewide: Make logging variables more consistent

This aims to better group related variables and differentiate keywords
like INTERFACE_NAME into NET vs DBUS.

Tested: Ran on a machine to verify that our info log messages still look
sane in the journal.

Change-Id: Ic4d1faaaf5c432e69cacd387fa972481916b6bc8
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/src/ipaddress.cpp b/src/ipaddress.cpp
index 464a2c0..32c9462 100644
--- a/src/ipaddress.cpp
+++ b/src/ipaddress.cpp
@@ -90,10 +90,10 @@
 {
     if (origin() != IP::AddressOrigin::Static)
     {
-        lg2::error("Tried to delete a non-static address {IP_ADDRESS} prefix "
-                   "{PREFIX} interface {INTERFACE_NAME}",
-                   "IP_ADDRESS", address(), "PREFIX", prefixLength(),
-                   "INTERFACE_NAME", parent.get().interfaceName());
+        lg2::error("Tried to delete a non-static address {NET_IP} prefix "
+                   "{NET_PFX} interface {NET_INTF}",
+                   "NET_IP", address(), "NET_PFX", prefixLength(), "NET_INTF",
+                   parent.get().interfaceName());
         elog<InternalFailure>();
     }