diff --git a/man/picom.1.asciidoc b/man/picom.1.asciidoc
index 4abae725..99af8b93 100644
--- a/man/picom.1.asciidoc
+++ b/man/picom.1.asciidoc
@@ -95,7 +95,7 @@ OPTIONS
 	Blue color value of shadow (0.0 - 1.0, defaults to 0).
 
 *--inactive-opacity-override*::
-	Let inactive opacity set by *-i* override the '_NET_WM_OPACITY' values of windows.
+	Let inactive opacity set by *-i* override the '_NET_WM_WINDOW_OPACITY' values of windows.
 
 *--active-opacity* 'OPACITY'::
 	Default opacity for active windows. (0.0 - 1.0, defaults to 1.0)
@@ -128,7 +128,7 @@ OPTIONS
 	Try to detect windows with rounded corners and don't consider them shaped windows. The accuracy is not very high, unfortunately.
 
 *--detect-client-opacity*::
-	Detect '_NET_WM_OPACITY' on client windows, useful for window managers not passing '_NET_WM_OPACITY' of client windows to frame windows.
+	Detect '_NET_WM_WINDOW_OPACITY' on client windows, useful for window managers not passing '_NET_WM_WINDOW_OPACITY' of client windows to frame windows.
 
 *--refresh-rate* 'REFRESH_RATE'::
 	Specify refresh rate of the screen. If not specified or 0, picom will try detecting this with X RandR extension.
diff --git a/picom.sample.conf b/picom.sample.conf
index 1410a10a..e62251e4 100644
--- a/picom.sample.conf
+++ b/picom.sample.conf
@@ -109,7 +109,7 @@ inactive-opacity = 0.8;
 # frame-opacity = 1.0
 frame-opacity = 0.7;
 
-# Let inactive opacity set by -i override the '_NET_WM_OPACITY' values of windows.
+# Let inactive opacity set by -i override the '_NET_WM_WINDOW_OPACITY' values of windows.
 # inactive-opacity-override = true
 inactive-opacity-override = false;
 
@@ -235,8 +235,8 @@ mark-ovredir-focused = true;
 # detect-rounded-corners = false
 detect-rounded-corners = true;
 
-# Detect '_NET_WM_OPACITY' on client windows, useful for window managers
-# not passing '_NET_WM_OPACITY' of client windows to frame windows.
+# Detect '_NET_WM_WINDOW_OPACITY' on client windows, useful for window managers
+# not passing '_NET_WM_WINDOW_OPACITY' of client windows to frame windows.
 #
 # detect-client-opacity = false
 detect-client-opacity = true;
diff --git a/src/config.h b/src/config.h
index 052e38c2..c2d573e4 100644
--- a/src/config.h
+++ b/src/config.h
@@ -175,7 +175,7 @@ typedef struct options {
 
 	// === Opacity ===
 	/// Default opacity for inactive windows.
-	/// 32-bit integer with the format of _NET_WM_OPACITY.
+	/// 32-bit integer with the format of _NET_WM_WINDOW_OPACITY.
 	double inactive_opacity;
 	/// Default opacity for inactive windows.
 	double active_opacity;
@@ -185,8 +185,8 @@ typedef struct options {
 	/// Frame opacity. Relative to window opacity, also affects shadow
 	/// opacity.
 	double frame_opacity;
-	/// Whether to detect _NET_WM_OPACITY on client windows. Used on window
-	/// managers that don't pass _NET_WM_OPACITY to frame windows.
+	/// Whether to detect _NET_WM_WINDOW_OPACITY on client windows. Used on window
+	/// managers that don't pass _NET_WM_WINDOW_OPACITY to frame windows.
 	bool detect_client_opacity;
 
 	// === Other window processing ===
diff --git a/src/event.c b/src/event.c
index b0226311..e6052f1d 100644
--- a/src/event.c
+++ b/src/event.c
@@ -497,7 +497,7 @@ static inline void ev_property_notify(session_t *ps, xcb_property_notify_event_t
 		queue_redraw(ps);
 	}
 
-	// If _NET_WM_OPACITY changes
+	// If _NET_WM_WINDOW_OPACITY changes
 	if (ev->atom == ps->atoms->a_NET_WM_WINDOW_OPACITY) {
 		auto w = find_managed_win(ps, ev->window) ?: find_toplevel(ps, ev->window);
 		if (w) {
diff --git a/src/options.c b/src/options.c
index 1b0a5dc6..b1e8c389 100644
--- a/src/options.c
+++ b/src/options.c
@@ -109,7 +109,7 @@ static void usage(const char *argv0, int ret) {
 	    "  Blue color value of shadow (0.0 - 1.0, defaults to 0).\n"
 	    "\n"
 	    "--inactive-opacity-override\n"
-	    "  Inactive opacity set by -i overrides value of _NET_WM_OPACITY.\n"
+	    "  Inactive opacity set by -i overrides value of _NET_WM_WINDOW_OPACITY.\n"
 	    "\n"
 	    "--inactive-dim value\n"
 	    "  Dim inactive windows. (0.0 - 1.0, defaults to 0)\n"
@@ -156,8 +156,8 @@ static void usage(const char *argv0, int ret) {
 	    "  conditions.\n"
 	    "\n"
 	    "--detect-client-opacity\n"
-	    "  Detect _NET_WM_OPACITY on client windows, useful for window\n"
-	    "  managers not passing _NET_WM_OPACITY of client windows to frame\n"
+	    "  Detect _NET_WM_WINDOW_OPACITY on client windows, useful for window\n"
+	    "  managers not passing _NET_WM_WINDOW_OPACITY of client windows to frame\n"
 	    "  windows.\n"
 	    "\n"
 	    "--refresh-rate val\n"
diff --git a/src/win.h b/src/win.h
index 7b5c5e65..6c6ae323 100644
--- a/src/win.h
+++ b/src/win.h
@@ -209,7 +209,7 @@ struct managed_win {
 	/// Previous window opacity.
 	double opacity_target_old;
 	/// true if window (or client window, for broken window managers
-	/// not transferring client window's _NET_WM_OPACITY value) has opacity prop
+	/// not transferring client window's _NET_WM_WINDOW_OPACITY value) has opacity prop
 	bool has_opacity_prop;
 	/// Cached value of opacity window attribute.
 	opacity_t opacity_prop;