diff --git a/.gitignore b/.gitignore
index b5a1298..413119b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ __pycache__
 pve
 
 # CMake build directories
-build*
+**/build*
 
 # Data files and build outputs
 *.log
diff --git a/generator/vk_layer/source/device.hpp b/generator/vk_layer/source/device.hpp
index 607a18d..e65958c 100644
--- a/generator/vk_layer/source/device.hpp
+++ b/generator/vk_layer/source/device.hpp
@@ -115,14 +115,14 @@ class Device
         VkCommandBuffer handle);
 
     /**
-     * \brief Drop a device from the global store of dispatchable devices.
+     * @brief Drop a device from the global store of dispatchable devices.
      *
      * This must be called before the driver VkDevice has been destroyed, as
      * we deference the native device handle to get the dispatch key.
      *
-     * \param handle   The dispatchable device handle to use as an indirect lookup.
+     * @param handle   The dispatchable device handle to use as an indirect lookup.
      *
-     * \return Returns the ownership of the Device object to the caller.
+     * @return Returns the ownership of the Device object to the caller.
      */
     static std::unique_ptr<Device> destroy(
         VkDevice handle);
diff --git a/generator/vk_layer/source/instance.hpp b/generator/vk_layer/source/instance.hpp
index f9b20a5..d53d999 100644
--- a/generator/vk_layer/source/instance.hpp
+++ b/generator/vk_layer/source/instance.hpp
@@ -99,14 +99,14 @@ class Instance
         VkPhysicalDevice handle);
 
     /**
-     * \brief Drop an instance from the global store of dispatchable instances.
+     * @brief Drop an instance from the global store of dispatchable instances.
      *
      * This must be called before the driver VkInstance has been destroyed, as
      * we deference the native instance handle to get the dispatch key.
      *
-     * \param handle   The dispatchable instance handle to use as an indirect lookup.
+     * @param handle   The dispatchable instance handle to use as an indirect lookup.
      *
-     * \return Returns the ownership of the Instance object to the caller.
+     * @return Returns the ownership of the Instance object to the caller.
      */
     static std::unique_ptr<Instance> destroy(
         VkInstance handle);
diff --git a/layer_example/source/device.hpp b/layer_example/source/device.hpp
index 3036d3e..0b3d433 100644
--- a/layer_example/source/device.hpp
+++ b/layer_example/source/device.hpp
@@ -110,14 +110,14 @@ class Device
     static Device* retrieve(VkCommandBuffer handle);
 
     /**
-     * \brief Drop a device from the global store of dispatchable devices.
+     * @brief Drop a device from the global store of dispatchable devices.
      *
      * This must be called before the driver VkDevice has been destroyed, as
      * we deference the native device handle to get the dispatch key.
      *
-     * \param handle   The dispatchable device handle to use as an indirect lookup.
+     * @param handle   The dispatchable device handle to use as an indirect lookup.
      *
-     * \return Returns the ownership of the Device object to the caller.
+     * @return Returns the ownership of the Device object to the caller.
      */
     static std::unique_ptr<Device> destroy(
         VkDevice handle);
diff --git a/layer_example/source/instance.hpp b/layer_example/source/instance.hpp
index 16ac5e5..4c989b2 100644
--- a/layer_example/source/instance.hpp
+++ b/layer_example/source/instance.hpp
@@ -95,14 +95,14 @@ class Instance
     static Instance* retrieve(VkPhysicalDevice handle);
 
     /**
-     * \brief Drop an instance from the global store of dispatchable instances.
+     * @brief Drop an instance from the global store of dispatchable instances.
      *
      * This must be called before the driver VkInstance has been destroyed, as
      * we deference the native instance handle to get the dispatch key.
      *
-     * \param handle   The dispatchable instance handle to use as an indirect lookup.
+     * @param handle   The dispatchable instance handle to use as an indirect lookup.
      *
-     * \return Returns the ownership of the Instance object to the caller.
+     * @return Returns the ownership of the Instance object to the caller.
      */
     static std::unique_ptr<Instance> destroy(
         VkInstance handle);
diff --git a/layer_gpu_profile/source/device.hpp b/layer_gpu_profile/source/device.hpp
index a4f6619..f746e51 100644
--- a/layer_gpu_profile/source/device.hpp
+++ b/layer_gpu_profile/source/device.hpp
@@ -118,14 +118,14 @@ class Device
     static Device* retrieve(VkCommandBuffer handle);
 
     /**
-     * \brief Drop a device from the global store of dispatchable devices.
+     * @brief Drop a device from the global store of dispatchable devices.
      *
      * This must be called before the driver VkDevice has been destroyed, as
      * we deference the native device handle to get the dispatch key.
      *
-     * \param handle   The dispatchable device handle to use as an indirect lookup.
+     * @param handle   The dispatchable device handle to use as an indirect lookup.
      *
-     * \return Returns the ownership of the Device object to the caller.
+     * @return Returns the ownership of the Device object to the caller.
      */
     static std::unique_ptr<Device> destroy(
         VkDevice handle);
diff --git a/layer_gpu_profile/source/instance.hpp b/layer_gpu_profile/source/instance.hpp
index 50b109b..606ad7f 100644
--- a/layer_gpu_profile/source/instance.hpp
+++ b/layer_gpu_profile/source/instance.hpp
@@ -96,14 +96,14 @@ class Instance
     static Instance* retrieve(VkPhysicalDevice handle);
 
     /**
-     * \brief Drop an instance from the global store of dispatchable instances.
+     * @brief Drop an instance from the global store of dispatchable instances.
      *
      * This must be called before the driver VkInstance has been destroyed, as
      * we deference the native instance handle to get the dispatch key.
      *
-     * \param handle   The dispatchable instance handle to use as an indirect lookup.
+     * @param handle   The dispatchable instance handle to use as an indirect lookup.
      *
-     * \return Returns the ownership of the Instance object to the caller.
+     * @return Returns the ownership of the Instance object to the caller.
      */
     static std::unique_ptr<Instance> destroy(
         VkInstance handle);
diff --git a/layer_gpu_support/source/device.hpp b/layer_gpu_support/source/device.hpp
index d9bbcbc..0a61a73 100644
--- a/layer_gpu_support/source/device.hpp
+++ b/layer_gpu_support/source/device.hpp
@@ -111,14 +111,14 @@ class Device
     static Device* retrieve(VkCommandBuffer handle);
 
     /**
-     * \brief Drop a device from the global store of dispatchable devices.
+     * @brief Drop a device from the global store of dispatchable devices.
      *
      * This must be called before the driver VkDevice has been destroyed, as
      * we deference the native device handle to get the dispatch key.
      *
-     * \param handle   The dispatchable device handle to use as an indirect lookup.
+     * @param handle   The dispatchable device handle to use as an indirect lookup.
      *
-     * \return Returns the ownership of the Device object to the caller.
+     * @return Returns the ownership of the Device object to the caller.
      */
     static std::unique_ptr<Device> destroy(
         VkDevice handle);
diff --git a/layer_gpu_support/source/instance.hpp b/layer_gpu_support/source/instance.hpp
index 6cbbfa2..8142d5b 100644
--- a/layer_gpu_support/source/instance.hpp
+++ b/layer_gpu_support/source/instance.hpp
@@ -95,14 +95,14 @@ class Instance
     static Instance* retrieve(VkPhysicalDevice handle);
 
     /**
-     * \brief Drop an instance from the global store of dispatchable instances.
+     * @brief Drop an instance from the global store of dispatchable instances.
      *
      * This must be called before the driver VkInstance has been destroyed, as
      * we deference the native instance handle to get the dispatch key.
      *
-     * \param handle   The dispatchable instance handle to use as an indirect lookup.
+     * @param handle   The dispatchable instance handle to use as an indirect lookup.
      *
-     * \return Returns the ownership of the Instance object to the caller.
+     * @return Returns the ownership of the Instance object to the caller.
      */
     static std::unique_ptr<Instance> destroy(
         VkInstance handle);
diff --git a/layer_gpu_timeline/source/device.hpp b/layer_gpu_timeline/source/device.hpp
index 4d9245b..937b007 100644
--- a/layer_gpu_timeline/source/device.hpp
+++ b/layer_gpu_timeline/source/device.hpp
@@ -113,14 +113,14 @@ class Device
     static Device* retrieve(VkCommandBuffer handle);
 
     /**
-     * \brief Drop a device from the global store of dispatchable devices.
+     * @brief Drop a device from the global store of dispatchable devices.
      *
      * This must be called before the driver VkDevice has been destroyed, as
      * we deference the native device handle to get the dispatch key.
      *
-     * \param handle   The dispatchable device handle to use as an indirect lookup.
+     * @param handle   The dispatchable device handle to use as an indirect lookup.
      *
-     * \return Returns the ownership of the Device object to the caller.
+     * @return Returns the ownership of the Device object to the caller.
      */
     static std::unique_ptr<Device> destroy(
         VkDevice handle);
diff --git a/layer_gpu_timeline/source/instance.hpp b/layer_gpu_timeline/source/instance.hpp
index 16ac5e5..4c989b2 100644
--- a/layer_gpu_timeline/source/instance.hpp
+++ b/layer_gpu_timeline/source/instance.hpp
@@ -95,14 +95,14 @@ class Instance
     static Instance* retrieve(VkPhysicalDevice handle);
 
     /**
-     * \brief Drop an instance from the global store of dispatchable instances.
+     * @brief Drop an instance from the global store of dispatchable instances.
      *
      * This must be called before the driver VkInstance has been destroyed, as
      * we deference the native instance handle to get the dispatch key.
      *
-     * \param handle   The dispatchable instance handle to use as an indirect lookup.
+     * @param handle   The dispatchable instance handle to use as an indirect lookup.
      *
-     * \return Returns the ownership of the Instance object to the caller.
+     * @return Returns the ownership of the Instance object to the caller.
      */
     static std::unique_ptr<Instance> destroy(
         VkInstance handle);
diff --git a/layer_gpu_timeline/source/timeline_protobuf_encoder.hpp b/layer_gpu_timeline/source/timeline_protobuf_encoder.hpp
index 9b5b3c3..75f0883 100644
--- a/layer_gpu_timeline/source/timeline_protobuf_encoder.hpp
+++ b/layer_gpu_timeline/source/timeline_protobuf_encoder.hpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * \file
+ * @file
  * Methods for transforming layer command stream workloads into metadata messages
  * for transmission to the host.
  *
diff --git a/source_common/comms/comms_transmitter.cpp b/source_common/comms/comms_transmitter.cpp
index e7924c1..f5baff3 100644
--- a/source_common/comms/comms_transmitter.cpp
+++ b/source_common/comms/comms_transmitter.cpp
@@ -61,7 +61,7 @@ Transmitter::~Transmitter()
 void Transmitter::runTransmitter()
 {
     // Keep looping until we are told to stop and message queue is empty
-    while (!stopRequested || !parent.messageQueue.is_empty())
+    while (!stopRequested || !parent.messageQueue.isEmpty())
     {
         auto message = parent.dequeueMessage();
 
diff --git a/source_common/trackers/command_buffer.hpp b/source_common/trackers/command_buffer.hpp
index d67d05c..312fac7 100644
--- a/source_common/trackers/command_buffer.hpp
+++ b/source_common/trackers/command_buffer.hpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * \file
+ * @file
  * The declaration of Vulkan command pool and command buffer use trackers.
  *
  * Role summary
@@ -246,7 +246,7 @@ class CommandPool
      *
      * @param commandBuffer   The Vulkan handle of the allocated command buffer.
      *
-     * \return The layer wrapper object for the command buffer.
+     * @return The layer wrapper object for the command buffer.
      */
     CommandBuffer& allocateCommandBuffer(VkCommandBuffer commandBuffer);
 
diff --git a/source_common/trackers/device.hpp b/source_common/trackers/device.hpp
index 316ae6c..668c8a7 100644
--- a/source_common/trackers/device.hpp
+++ b/source_common/trackers/device.hpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * \file
+ * @file
  * This module implements basic tracking of Vulkan devices.
  *
  * Role summary
diff --git a/source_common/trackers/layer_command_stream.hpp b/source_common/trackers/layer_command_stream.hpp
index 415a357..6d8a240 100644
--- a/source_common/trackers/layer_command_stream.hpp
+++ b/source_common/trackers/layer_command_stream.hpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * \file
+ * @file
  * The declaration of a replayable layer command stream.
  *
  * Role summary
diff --git a/source_common/trackers/queue.hpp b/source_common/trackers/queue.hpp
index 6d8bed3..c9a0131 100644
--- a/source_common/trackers/queue.hpp
+++ b/source_common/trackers/queue.hpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * \file
+ * @file
  * The declaration of Vulkan queue use trackers.
  *
  * Role summary
diff --git a/source_common/trackers/render_pass.hpp b/source_common/trackers/render_pass.hpp
index 4dafd93..c342e51 100644
--- a/source_common/trackers/render_pass.hpp
+++ b/source_common/trackers/render_pass.hpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * \file
+ * @file
  * The declaration of Vulkan render pass use trackers.
  *
  * Role summary
diff --git a/source_common/trackers/stats.hpp b/source_common/trackers/stats.hpp
index 9f4b47b..e805f1a 100644
--- a/source_common/trackers/stats.hpp
+++ b/source_common/trackers/stats.hpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * \file
+ * @file
  * This module implements basic counter tracking of Vulkan workloads.
  */
 
diff --git a/source_common/utils/queue.hpp b/source_common/utils/queue.hpp
index 373f68d..ce245be 100644
--- a/source_common/utils/queue.hpp
+++ b/source_common/utils/queue.hpp
@@ -51,8 +51,8 @@ class Task
      */
     void wait()
     {
-        std::unique_lock<std::mutex> lock(condition_lock);
-        complete_condition.wait(lock, [this]{ return complete.load(); });
+        std::unique_lock<std::mutex> lock(conditionLock);
+        completeCondition.wait(lock, [this]{ return complete.load(); });
     }
 
     /**
@@ -60,10 +60,10 @@ class Task
      */
     void notify()
     {
-        std::unique_lock<std::mutex> lock(condition_lock);
+        std::unique_lock<std::mutex> lock(conditionLock);
         complete = true;
         lock.unlock();
-        complete_condition.notify_all();
+        completeCondition.notify_all();
     }
 
 private:
@@ -71,10 +71,10 @@ class Task
     std::atomic<bool> complete { false };
 
     /** @brief Condition variable for notifications. */
-    std::condition_variable complete_condition;
+    std::condition_variable completeCondition;
 
     /** @brief Lock for notifications. */
-    std::mutex condition_lock;
+    std::mutex conditionLock;
 };
 
 
@@ -86,7 +86,7 @@ class TaskQueue
 {
 private:
     /** @brief Lock for thread-safe access. */
-    std::mutex store_lock;
+    std::mutex storeLock;
 
     /** @brief Condition variable for notifications. */
     std::condition_variable condition;
@@ -103,7 +103,7 @@ class TaskQueue
     void put(
         T task
     ) {
-        std::lock_guard<std::mutex> lock(store_lock);
+        std::lock_guard<std::mutex> lock(storeLock);
         store.push_back(task);
         condition.notify_one();
     }
@@ -117,7 +117,7 @@ class TaskQueue
      */
     T get()
     {
-        std::unique_lock<std::mutex> lock(store_lock);
+        std::unique_lock<std::mutex> lock(storeLock);
 
         // Release lock until we have data, and then reacquire
         while(store.empty())
@@ -138,9 +138,9 @@ class TaskQueue
      *
      * @return @c true if the queue is empty, @c false otherwise.
      */
-    bool is_empty()
+    bool isEmpty()
     {
-        std::unique_lock<std::mutex> lock(store_lock);
+        std::lock_guard<std::mutex> lock(storeLock);
         return store.empty();
     }
 };