change ID to Id (in server part)

src/server/ua_server_ns0.c

@@ -480,7 +480,7 @@ readMonitoredItems(UA_Server *server, const UA_NodeId *sessionId, void *sessionC
     if(!session)
         return UA_STATUSCODE_BADINTERNALERROR;
     UA_UInt32 subscriptionId = *((UA_UInt32*)(input[0].data));
-    UA_Subscription* subscription = UA_Session_getSubscriptionByID(session, subscriptionId);
+    UA_Subscription* subscription = UA_Session_getSubscriptionById(session, subscriptionId);
     if(!subscription)
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
 

src/server/ua_services_subscription.c

@@ -25,7 +25,7 @@ setSubscriptionSettings(UA_Server *server, UA_Subscription *subscription,
     if(retval != UA_STATUSCODE_GOOD)
         UA_LOG_DEBUG_SESSION(server->config.logger, subscription->session, "Subscription %u | "
                              "Could not unregister publish callback with error code %s",
-                             subscription->subscriptionID, UA_StatusCode_name(retval));
+                             subscription->subscriptionId, UA_StatusCode_name(retval));
 
     /* re-parameterize the subscription */
     subscription->publishingInterval = requestedPublishingInterval;
@@ -50,7 +50,7 @@ setSubscriptionSettings(UA_Server *server, UA_Subscription *subscription,
     if(retval != UA_STATUSCODE_GOOD)
         UA_LOG_DEBUG_SESSION(server->config.logger, subscription->session, "Subscription %u | "
                              "Could not register publish callback with error code %s",
-                             subscription->subscriptionID, UA_StatusCode_name(retval));
+                             subscription->subscriptionId, UA_StatusCode_name(retval));
 }
 
 void
@@ -71,7 +71,7 @@ Service_CreateSubscription(UA_Server *server, UA_Session *session,
         response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
         return;
     }
-    newSubscription->subscriptionID = UA_Session_getUniqueSubscriptionID(session);
+    newSubscription->subscriptionId = UA_Session_getUniqueSubscriptionId(session);
     UA_Session_addSubscription(session, newSubscription);
 
     /* Set the subscription parameters */
@@ -82,7 +82,7 @@ Service_CreateSubscription(UA_Server *server, UA_Session *session,
     newSubscription->currentKeepAliveCount = newSubscription->maxKeepAliveCount; /* set settings first */
 
     /* Prepare the response */
-    response->subscriptionId = newSubscription->subscriptionID;
+    response->subscriptionId = newSubscription->subscriptionId;
     response->revisedPublishingInterval = newSubscription->publishingInterval;
     response->revisedLifetimeCount = newSubscription->lifeTimeCount;
     response->revisedMaxKeepAliveCount = newSubscription->maxKeepAliveCount;
@@ -100,7 +100,7 @@ Service_ModifySubscription(UA_Server *server, UA_Session *session,
     UA_LOG_DEBUG_SESSION(server->config.logger, session,
                          "Processing ModifySubscriptionRequest");
 
-    UA_Subscription *sub = UA_Session_getSubscriptionByID(session, request->subscriptionId);
+    UA_Subscription *sub = UA_Session_getSubscriptionById(session, request->subscriptionId);
     if(!sub) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return;
@@ -122,7 +122,7 @@ Operation_SetPublishingMode(UA_Server *Server, UA_Session *session,
                             UA_UInt32 *subscriptionId,
                             UA_StatusCode *result) {
     UA_Subscription *sub =
-        UA_Session_getSubscriptionByID(session, *subscriptionId);
+        UA_Session_getSubscriptionById(session, *subscriptionId);
     if(!sub) {
         *result = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return;
@@ -162,7 +162,7 @@ setMonitoredItemSettings(UA_Server *server, UA_MonitoredItem *mon,
 
     /* SamplingInterval */
     UA_Double samplingInterval = params->samplingInterval;
-    if(mon->attributeID == UA_ATTRIBUTEID_VALUE) {
+    if(mon->attributeId == UA_ATTRIBUTEID_VALUE) {
         const UA_VariableNode *vn = (const UA_VariableNode*)
             UA_Nodestore_get(server, &mon->monitoredNodeId);
         if(vn) {
@@ -171,7 +171,7 @@ setMonitoredItemSettings(UA_Server *server, UA_MonitoredItem *mon,
                 samplingInterval = vn->minimumSamplingInterval;
             UA_Nodestore_release(server, (const UA_Node*)vn);
         }
-    } else if(mon->attributeID == UA_ATTRIBUTEID_EVENTNOTIFIER) {
+    } else if(mon->attributeId == UA_ATTRIBUTEID_EVENTNOTIFIER) {
         /* TODO: events should not need a samplinginterval */
         samplingInterval = 10000.0f; // 10 seconds to reduce the load
     }
@@ -260,7 +260,7 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session,
         return;
     }
     newMon->subscription = op_sub;
-    newMon->attributeID = request->itemToMonitor.attributeId;
+    newMon->attributeId = request->itemToMonitor.attributeId;
     newMon->itemId = ++(op_sub->lastMonitoredItemId);
     newMon->timestampsToReturn = op_timestampsToReturn2;
     setMonitoredItemSettings(server, newMon, request->monitoringMode,
@@ -300,7 +300,7 @@ Service_CreateMonitoredItems(UA_Server *server, UA_Session *session,
     }
 
     /* Find the subscription */
-    op_sub = UA_Session_getSubscriptionByID(session, request->subscriptionId);
+    op_sub = UA_Session_getSubscriptionById(session, request->subscriptionId);
     if(!op_sub) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return;
@@ -360,7 +360,7 @@ void Service_ModifyMonitoredItems(UA_Server *server, UA_Session *session,
     }
 
     /* Get the subscription */
-    op_sub = UA_Session_getSubscriptionByID(session, request->subscriptionId);
+    op_sub = UA_Session_getSubscriptionById(session, request->subscriptionId);
     if(!op_sub) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return;
@@ -413,7 +413,7 @@ void Service_SetMonitoringMode(UA_Server *server, UA_Session *session,
     }
 
     /* Get the subscription */
-    op_sub = UA_Session_getSubscriptionByID(session, request->subscriptionId);
+    op_sub = UA_Session_getSubscriptionById(session, request->subscriptionId);
     if(!op_sub) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return;
@@ -500,7 +500,7 @@ Service_Publish(UA_Server *server, UA_Session *session,
     /* Delete Acknowledged Subscription Messages */
     for(size_t i = 0; i < request->subscriptionAcknowledgementsSize; ++i) {
         UA_SubscriptionAcknowledgement *ack = &request->subscriptionAcknowledgements[i];
-        UA_Subscription *sub = UA_Session_getSubscriptionByID(session, ack->subscriptionId);
+        UA_Subscription *sub = UA_Session_getSubscriptionById(session, ack->subscriptionId);
         if(!sub) {
             response->results[i] = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
             UA_LOG_DEBUG_SESSION(server->config.logger, session,
@@ -522,10 +522,10 @@ Service_Publish(UA_Server *server, UA_Session *session,
     UA_Boolean found = true; 
     int loopCount = 1;
 
-    if (session->lastSeenSubscriptionID > 0){
+    if (session->lastSeenSubscriptionId > 0){
         /* If we found anything one the first loop or if there are LATE 
-         * in the list before lastSeenSubscriptionID and not LATE after 
-         * lastSeenSubscriptionID we need a second loop.
+         * in the list before lastSeenSubscriptionId and not LATE after 
+         * lastSeenSubscriptionId we need a second loop.
          */
         loopCount = 2;
         /* We must find the last seen subscription id  */
@@ -535,14 +535,14 @@ Service_Publish(UA_Server *server, UA_Session *session,
     for(int i=0; i<loopCount; i++){
        LIST_FOREACH(immediate, &session->serverSubscriptions, listEntry) {
             if (!found){
-                if (session->lastSeenSubscriptionID == immediate->subscriptionID){
+                if (session->lastSeenSubscriptionId == immediate->subscriptionId){
                     found = true; 
                 }     
             }else{
                 if(immediate->state == UA_SUBSCRIPTIONSTATE_LATE) {
-                    session->lastSeenSubscriptionID = immediate->subscriptionID;
+                    session->lastSeenSubscriptionId = immediate->subscriptionId;
                     UA_LOG_DEBUG_SESSION(server->config.logger, session, "Subscription %u | "
-                                         "Response on a late subscription", immediate->subscriptionID);
+                                         "Response on a late subscription", immediate->subscriptionId);
                     UA_Subscription_publishCallback(server, immediate);
                     return;
                 }     
@@ -551,7 +551,7 @@ Service_Publish(UA_Server *server, UA_Session *session,
         /* after the first loop, we can publish the first subscription with UA_SUBSCRIPTIONSTATE_LATE */
         found = true;
     }
-    session->lastSeenSubscriptionID = 0;
+    session->lastSeenSubscriptionId = 0;
 }
 
 static void
@@ -610,7 +610,7 @@ void Service_DeleteMonitoredItems(UA_Server *server, UA_Session *session,
     }
 
     /* Get the subscription */
-    op_sub = UA_Session_getSubscriptionByID(session, request->subscriptionId);
+    op_sub = UA_Session_getSubscriptionById(session, request->subscriptionId);
     if(!op_sub) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return;
@@ -633,7 +633,7 @@ void Service_Republish(UA_Server *server, UA_Session *session,
                          "Processing RepublishRequest");
 
     /* Get the subscription */
-    UA_Subscription *sub = UA_Session_getSubscriptionByID(session, request->subscriptionId);
+    UA_Subscription *sub = UA_Session_getSubscriptionById(session, request->subscriptionId);
     if (!sub) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return;

src/server/ua_session.c

@@ -28,8 +28,8 @@ UA_Session adminSession = {
     UA_MAXCONTINUATIONPOINTS, /* .availableContinuationPoints */
     {NULL}, /* .continuationPoints */
 #ifdef UA_ENABLE_SUBSCRIPTIONS
-    0, /* .lastSubscriptionID */
-    0, /* .lastSeenSubscriptionID */
+    0, /* .lastSubscriptionId */
+    0, /* .lastSeenSubscriptionId */
     {NULL}, /* .serverSubscriptions */
     {NULL, NULL}, /* .responseQueue */
     0, /* numSubscriptions */
@@ -101,8 +101,8 @@ void UA_Session_addSubscription(UA_Session *session, UA_Subscription *newSubscri
 
 UA_StatusCode
 UA_Session_deleteSubscription(UA_Server *server, UA_Session *session,
-                              UA_UInt32 subscriptionID) {
-    UA_Subscription *sub = UA_Session_getSubscriptionByID(session, subscriptionID);
+                              UA_UInt32 subscriptionId) {
+    UA_Subscription *sub = UA_Session_getSubscriptionById(session, subscriptionId);
     if(!sub)
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
 
@@ -125,17 +125,17 @@ UA_Session_getNumSubscriptions( UA_Session *session ) {
 }
 
 UA_Subscription *
-UA_Session_getSubscriptionByID(UA_Session *session, UA_UInt32 subscriptionID) {
+UA_Session_getSubscriptionById(UA_Session *session, UA_UInt32 subscriptionId) {
     UA_Subscription *sub;
     LIST_FOREACH(sub, &session->serverSubscriptions, listEntry) {
-        if(sub->subscriptionID == subscriptionID)
+        if(sub->subscriptionId == subscriptionId)
             break;
     }
     return sub;
 }
 
-UA_UInt32 UA_Session_getUniqueSubscriptionID(UA_Session *session) {
-    return ++(session->lastSubscriptionID);
+UA_UInt32 UA_Session_getUniqueSubscriptionId(UA_Session *session) {
+    return ++(session->lastSubscriptionId);
 }
 
 UA_UInt32

src/server/ua_session.h

@@ -51,8 +51,8 @@ typedef struct {
     UA_UInt16 availableContinuationPoints;
     LIST_HEAD(ContinuationPointList, ContinuationPointEntry) continuationPoints;
 #ifdef UA_ENABLE_SUBSCRIPTIONS
-    UA_UInt32 lastSubscriptionID;
-    UA_UInt32 lastSeenSubscriptionID;
+    UA_UInt32 lastSubscriptionId;
+    UA_UInt32 lastSeenSubscriptionId;
     LIST_HEAD(UA_ListOfUASubscriptions, UA_Subscription) serverSubscriptions;
     SIMPLEQ_HEAD(UA_ListOfQueuedPublishResponses, UA_PublishResponseEntry) responseQueue;
     UA_UInt32        numSubscriptions;
@@ -61,7 +61,7 @@ typedef struct {
 } UA_Session;
 
 /* Local access to the services (for startup and maintenance) uses this Session
- * with all possible access rights (Session ID: 1) */
+ * with all possible access rights (Session Id: 1) */
 extern UA_Session adminSession;
 
 /**
@@ -87,14 +87,14 @@ UA_UInt32
 UA_Session_getNumSubscriptions(UA_Session *session );
 
 UA_Subscription *
-UA_Session_getSubscriptionByID(UA_Session *session, UA_UInt32 subscriptionID);
+UA_Session_getSubscriptionById(UA_Session *session, UA_UInt32 subscriptionId);
 
 UA_StatusCode
 UA_Session_deleteSubscription(UA_Server *server, UA_Session *session,
-                              UA_UInt32 subscriptionID);
+                              UA_UInt32 subscriptionId);
 
 UA_UInt32
-UA_Session_getUniqueSubscriptionID(UA_Session *session);
+UA_Session_getUniqueSubscriptionId(UA_Session *session);
 
 UA_UInt32
 UA_Session_getNumPublishReq(UA_Session *session);

src/server/ua_subscription.c

@@ -8,7 +8,7 @@
 #ifdef UA_ENABLE_SUBSCRIPTIONS /* conditional compilation */
 
 UA_Subscription *
-UA_Subscription_new(UA_Session *session, UA_UInt32 subscriptionID) {
+UA_Subscription_new(UA_Session *session, UA_UInt32 subscriptionId) {
     /* Allocate the memory */
     UA_Subscription *newItem =
         (UA_Subscription*)UA_calloc(1, sizeof(UA_Subscription));
@@ -17,7 +17,7 @@ UA_Subscription_new(UA_Session *session, UA_UInt32 subscriptionID) {
 
     /* Remaining members are covered by calloc zeroing out the memory */
     newItem->session = session;
-    newItem->subscriptionID = subscriptionID;
+    newItem->subscriptionId = subscriptionId;
     newItem->numMonitoredItems = 0;
     newItem->state = UA_SUBSCRIPTIONSTATE_NORMAL; /* The first publish response is sent immediately */
     TAILQ_INIT(&newItem->retransmissionQueue);
@@ -49,10 +49,10 @@ UA_Subscription_deleteMembers(UA_Subscription *subscription, UA_Server *server)
 
 UA_MonitoredItem *
 UA_Subscription_getMonitoredItem(UA_Subscription *sub,
-                                 UA_UInt32 monitoredItemID) {
+                                 UA_UInt32 monitoredItemId) {
     UA_MonitoredItem *mon;
     LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
-        if(mon->itemId == monitoredItemID)
+        if(mon->itemId == monitoredItemId)
             break;
     }
     return mon;
@@ -60,11 +60,11 @@ UA_Subscription_getMonitoredItem(UA_Subscription *sub,
 
 UA_StatusCode
 UA_Subscription_deleteMonitoredItem(UA_Server *server, UA_Subscription *sub,
-                                    UA_UInt32 monitoredItemID) {
+                                    UA_UInt32 monitoredItemId) {
     /* Find the MonitoredItem */
     UA_MonitoredItem *mon;
     LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
-        if(mon->itemId == monitoredItemID)
+        if(mon->itemId == monitoredItemId)
             break;
     }
     if(!mon)
@@ -251,7 +251,7 @@ void
 UA_Subscription_publishCallback(UA_Server *server, UA_Subscription *sub) {
     UA_LOG_DEBUG_SESSION(server->config.logger, sub->session,
                          "Subscription %u | Publish Callback",
-                         sub->subscriptionID);
+                         sub->subscriptionId);
 
     /* Count the available notifications */
     UA_Boolean moreNotifications = false;
@@ -264,7 +264,7 @@ UA_Subscription_publishCallback(UA_Server *server, UA_Subscription *sub) {
             return;
         UA_LOG_DEBUG_SESSION(server->config.logger, sub->session,
                              "Subscription %u | Sending a KeepAlive",
-                             sub->subscriptionID);
+                             sub->subscriptionId);
     }
 
     /* Check if the securechannel is valid */
@@ -280,7 +280,7 @@ UA_Subscription_publishCallback(UA_Server *server, UA_Subscription *sub) {
         UA_LOG_DEBUG_SESSION(server->config.logger, sub->session,
                              "Subscription %u | Cannot send a publish "
                              "response since the publish queue is empty",
-                             sub->subscriptionID);
+                             sub->subscriptionId);
         if(sub->state != UA_SUBSCRIPTIONSTATE_LATE) {
             sub->state = UA_SUBSCRIPTIONSTATE_LATE;
         } else {
@@ -288,9 +288,9 @@ UA_Subscription_publishCallback(UA_Server *server, UA_Subscription *sub) {
             if(sub->currentLifetimeCount > sub->lifeTimeCount) {
                 UA_LOG_DEBUG_SESSION(server->config.logger, sub->session,
                                      "Subscription %u | End of lifetime "
-                                     "for subscription", sub->subscriptionID);
+                                     "for subscription", sub->subscriptionId);
                 UA_Session_deleteSubscription(server, sub->session,
-                                              sub->subscriptionID);
+                                              sub->subscriptionId);
             }
         }
         return;
@@ -306,7 +306,7 @@ UA_Subscription_publishCallback(UA_Server *server, UA_Subscription *sub) {
         if(!retransmission) {
             UA_LOG_WARNING_SESSION(server->config.logger, sub->session,
                                    "Subscription %u | Could not allocate memory "
-                                   "for retransmission", sub->subscriptionID);
+                                   "for retransmission", sub->subscriptionId);
             return;
         }
 
@@ -316,7 +316,7 @@ UA_Subscription_publishCallback(UA_Server *server, UA_Subscription *sub) {
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING_SESSION(server->config.logger, sub->session,
                                    "Subscription %u | Could not prepare the "
-                                   "notification message", sub->subscriptionID);
+                                   "notification message", sub->subscriptionId);
             UA_free(retransmission);
             return;
         }
@@ -329,7 +329,7 @@ UA_Subscription_publishCallback(UA_Server *server, UA_Subscription *sub) {
 
     /* Set up the response */
     response->responseHeader.timestamp = UA_DateTime_now();
-    response->subscriptionId = sub->subscriptionID;
+    response->subscriptionId = sub->subscriptionId;
     response->moreNotifications = moreNotifications;
     message->publishTime = response->responseHeader.timestamp;
 
@@ -365,7 +365,7 @@ UA_Subscription_publishCallback(UA_Server *server, UA_Subscription *sub) {
     /* Send the response */
     UA_LOG_DEBUG_SESSION(server->config.logger, sub->session,
                          "Subscription %u | Sending out a publish response "
-                         "with %u notifications", sub->subscriptionID,
+                         "with %u notifications", sub->subscriptionId,
                          (UA_UInt32)notifications);
     UA_SecureChannel_sendSymmetricMessage(sub->session->header.channel, pre->requestId,
                                           UA_MESSAGETYPE_MSG, response,
@@ -443,7 +443,7 @@ UA_StatusCode
 Subscription_registerPublishCallback(UA_Server *server, UA_Subscription *sub) {
     UA_LOG_DEBUG_SESSION(server->config.logger, sub->session,
                          "Subscription %u | Register subscription "
-                         "publishing callback", sub->subscriptionID);
+                         "publishing callback", sub->subscriptionId);
 
     if(sub->publishCallbackIsRegistered)
         return UA_STATUSCODE_GOOD;
@@ -464,7 +464,7 @@ UA_StatusCode
 Subscription_unregisterPublishCallback(UA_Server *server, UA_Subscription *sub) {
     UA_LOG_DEBUG_SESSION(server->config.logger, sub->session,
                          "Subscription %u | Unregister subscription "
-                         "publishing callback", sub->subscriptionID);
+                         "publishing callback", sub->subscriptionId);
 
     if(!sub->publishCallbackIsRegistered)
         return UA_STATUSCODE_GOOD;

src/server/ua_subscription.h

@@ -38,7 +38,7 @@ typedef struct UA_MonitoredItem {
     UA_TimestampsToReturn timestampsToReturn;
     UA_MonitoringMode monitoringMode;
     UA_NodeId monitoredNodeId;
-    UA_UInt32 attributeID;
+    UA_UInt32 attributeId;
     UA_UInt32 clientHandle;
     UA_Double samplingInterval; // [ms]
     UA_UInt32 currentQueueSize;
@@ -91,7 +91,7 @@ struct UA_Subscription {
     UA_UInt32 lifeTimeCount;
     UA_UInt32 maxKeepAliveCount;
     UA_Double publishingInterval; /* in ms */
-    UA_UInt32 subscriptionID;
+    UA_UInt32 subscriptionId;
     UA_UInt32 notificationsPerPublish;
     UA_Boolean publishingEnabled;
     UA_UInt32 priority;
@@ -119,14 +119,14 @@ struct UA_Subscription {
     UA_UInt32 retransmissionQueueSize;
 };
 
-UA_Subscription * UA_Subscription_new(UA_Session *session, UA_UInt32 subscriptionID);
+UA_Subscription * UA_Subscription_new(UA_Session *session, UA_UInt32 subscriptionId);
 void UA_Subscription_deleteMembers(UA_Subscription *subscription, UA_Server *server);
 UA_StatusCode Subscription_registerPublishCallback(UA_Server *server, UA_Subscription *sub);
 UA_StatusCode Subscription_unregisterPublishCallback(UA_Server *server, UA_Subscription *sub);
 
 UA_StatusCode
 UA_Subscription_deleteMonitoredItem(UA_Server *server, UA_Subscription *sub,
-                                    UA_UInt32 monitoredItemID);
+                                    UA_UInt32 monitoredItemId);
 
 void
 UA_Subscription_addMonitoredItem(UA_Subscription *sub,
@@ -135,7 +135,7 @@ UA_UInt32
 UA_Subscription_getNumMonitoredItems(UA_Subscription *sub);
 
 UA_MonitoredItem *
-UA_Subscription_getMonitoredItem(UA_Subscription *sub, UA_UInt32 monitoredItemID);
+UA_Subscription_getMonitoredItem(UA_Subscription *sub, UA_UInt32 monitoredItemId);
 
 void UA_Subscription_publishCallback(UA_Server *server, UA_Subscription *sub);
 

src/server/ua_subscription_datachange.c

@@ -155,7 +155,7 @@ sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
         UA_LOG_WARNING_SESSION(server->config.logger, sub->session,
                                "Subscription %u | MonitoredItem %i | "
                                "Item for the publishing queue could not be allocated",
-                               sub->subscriptionID, monitoredItem->itemId);
+                               sub->subscriptionId, monitoredItem->itemId);
         return false;
     }
 
@@ -166,7 +166,7 @@ sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
             UA_LOG_WARNING_SESSION(server->config.logger, sub->session,
                                    "Subscription %u | MonitoredItem %i | "
                                    "ByteString to compare values could not be created",
-                                   sub->subscriptionID, monitoredItem->itemId);
+                                   sub->subscriptionId, monitoredItem->itemId);
             UA_free(newQueueItem);
             return false;
         }
@@ -181,7 +181,7 @@ sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
             UA_LOG_WARNING_SESSION(server->config.logger, sub->session,
                                    "Subscription %u | MonitoredItem %i | "
                                    "Item for the publishing queue could not be prepared",
-                                   sub->subscriptionID, monitoredItem->itemId);
+                                   sub->subscriptionId, monitoredItem->itemId);
             UA_free(newQueueItem);
             return false;
         }
@@ -194,7 +194,7 @@ sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
 
     UA_LOG_DEBUG_SESSION(server->config.logger, sub->session,
                          "Subscription %u | MonitoredItem %u | Sampled a new value",
-                         sub->subscriptionID, monitoredItem->itemId);
+                         sub->subscriptionId, monitoredItem->itemId);
 
     /* Replace the encoding for comparison */
     UA_ByteString_deleteMembers(&monitoredItem->lastSampledValue);
@@ -215,7 +215,7 @@ UA_MoniteredItem_SampleCallback(UA_Server *server,
         UA_LOG_DEBUG_SESSION(server->config.logger, sub->session,
                              "Subscription %u | MonitoredItem %i | "
                              "Not a data change notification",
-                             sub->subscriptionID, monitoredItem->itemId);
+                             sub->subscriptionId, monitoredItem->itemId);
         return;
     }
 
@@ -223,7 +223,7 @@ UA_MoniteredItem_SampleCallback(UA_Server *server,
     UA_ReadValueId rvid;
     UA_ReadValueId_init(&rvid);
     rvid.nodeId = monitoredItem->monitoredNodeId;
-    rvid.attributeId = monitoredItem->attributeID;
+    rvid.attributeId = monitoredItem->attributeId;
     rvid.indexRange = monitoredItem->indexRange;
     UA_DataValue value =
         UA_Server_readWithSession(server, sub->session,