diff --git a/CUE.NET.csproj b/CUE.NET.csproj
index beda141..b7d5900 100644
--- a/CUE.NET.csproj
+++ b/CUE.NET.csproj
@@ -50,7 +50,7 @@
     <Compile Include="Devices\Generic\Enums\CorsairAccessMode.cs" />
     <Compile Include="Devices\Generic\Enums\CorsairDeviceCaps.cs" />
     <Compile Include="Devices\Generic\Enums\CorsairDeviceType.cs" />
-    <Compile Include="Devices\Generic\OnExceptionEventArgs.cs" />
+    <Compile Include="Devices\Generic\ExceptionEventArgs.cs" />
     <Compile Include="Brushes\AbstractBrush.cs" />
     <Compile Include="Gradients\AbstractGradient.cs" />
     <Compile Include="Gradients\GradientStop.cs" />
diff --git a/Devices/Generic/AbstractCueDevice.cs b/Devices/Generic/AbstractCueDevice.cs
index b29ff7a..790d550 100644
--- a/Devices/Generic/AbstractCueDevice.cs
+++ b/Devices/Generic/AbstractCueDevice.cs
@@ -71,7 +71,7 @@ namespace CUE.NET.Devices.Generic
         /// <summary>
         /// Occurs when a catched exception is thrown inside the device.
         /// </summary>
-        public event OnExceptionEventHandler OnException;
+        public event ExceptionEventHandler Exception;
 
         #endregion
 
@@ -290,10 +290,10 @@ namespace CUE.NET.Devices.Generic
         /// Handles the needed event-calls for an exception.
         /// </summary>
         /// <param name="ex"></param>
-        /// <exception cref="Exception">A delegate callback throws an exception.</exception>
+        /// <exception cref="System.Exception">A delegate callback throws an exception.</exception>
         protected void ManageException(Exception ex)
         {
-            OnException?.Invoke(this, new OnExceptionEventArgs(ex));
+            Exception?.Invoke(this, new ExceptionEventArgs(ex));
         }
 
         /// <summary>
diff --git a/Devices/Generic/OnExceptionEventArgs.cs b/Devices/Generic/ExceptionEventArgs.cs
similarity index 71%
rename from Devices/Generic/OnExceptionEventArgs.cs
rename to Devices/Generic/ExceptionEventArgs.cs
index ecb3325..7d443a1 100644
--- a/Devices/Generic/OnExceptionEventArgs.cs
+++ b/Devices/Generic/ExceptionEventArgs.cs
@@ -6,9 +6,9 @@ using System;
 namespace CUE.NET.Devices.Generic
 {
     /// <summary>
-    /// Represents the information supplied with an OnException-event.
+    /// Represents the information supplied with an Exception-event.
     /// </summary>
-    public class OnExceptionEventArgs : EventArgs
+    public class ExceptionEventArgs : EventArgs
     {
         #region Properties & Fields
 
@@ -22,10 +22,10 @@ namespace CUE.NET.Devices.Generic
         #region Constructors
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="OnExceptionEventArgs"/> class.
+        /// Initializes a new instance of the <see cref="ExceptionEventArgs"/> class.
         /// </summary>
         /// <param name="exception">The exception which is responsible for the event-call.</param>
-        public OnExceptionEventArgs(Exception exception)
+        public ExceptionEventArgs(Exception exception)
         {
             this.Exception = exception;
         }
diff --git a/Devices/ICueDevice.cs b/Devices/ICueDevice.cs
index fc6a763..ed962e6 100644
--- a/Devices/ICueDevice.cs
+++ b/Devices/ICueDevice.cs
@@ -7,11 +7,11 @@ using CUE.NET.Devices.Generic.Enums;
 namespace CUE.NET.Devices
 {
     /// <summary>
-    /// Represents the event-handler of the OnException-event.
+    /// Represents the event-handler of the Exception-event.
     /// </summary>
     /// <param name="sender">The sender of the event.</param>
     /// <param name="args">The arguments provided by the event.</param>
-    public delegate void OnExceptionEventHandler(object sender, OnExceptionEventArgs args);
+    public delegate void ExceptionEventHandler(object sender, ExceptionEventArgs args);
 
     /// <summary>
     /// Represents a generic cue device.
@@ -37,7 +37,7 @@ namespace CUE.NET.Devices
         /// <summary>
         /// Occurs when a catched exception is thrown inside the device.
         /// </summary>
-        event OnExceptionEventHandler OnException;
+        event ExceptionEventHandler Exception;
 
         /// <summary>
         /// Perform an update for all dirty keys, or all keys if flushLeds is set to true.
diff --git a/Examples/AudioAnalyzer/Example_AudioAnalyzer_full/AudioAnalyzerExample.cs b/Examples/AudioAnalyzer/Example_AudioAnalyzer_full/AudioAnalyzerExample.cs
index ff20d31..db52cc7 100644
--- a/Examples/AudioAnalyzer/Example_AudioAnalyzer_full/AudioAnalyzerExample.cs
+++ b/Examples/AudioAnalyzer/Example_AudioAnalyzer_full/AudioAnalyzerExample.cs
@@ -53,7 +53,7 @@ namespace Example_AudioAnalyzer_full
             //_keyboard.UpdateFrequency = 1f / 60f; // 60 updates per second
 
             // This is useful for debugging-purposes
-            _keyboard.OnException += (sender, args) => Console.WriteLine(args.Exception.Message);
+            _keyboard.Exception += (sender, args) => Console.WriteLine(args.Exception.Message);
 
             Console.WriteLine("CUE.NET initialized!");
         }