diff --git a/include/clap/ext/audio-ports.h b/include/clap/ext/audio-ports.h
index 74b94c32..2bd6d4b6 100644
--- a/include/clap/ext/audio-ports.h
+++ b/include/clap/ext/audio-ports.h
@@ -65,15 +65,14 @@ typedef struct clap_audio_port_info {
    clap_id in_place_pair;
 } clap_audio_port_info_t;
 
-// The audio ports scan has to be done while the plugin is deactivated.
 typedef struct clap_plugin_audio_ports {
    // Number of ports, for either input or output
-   // [main-thread]
+   // [main-thread & !active]
    uint32_t(CLAP_ABI *count)(const clap_plugin_t *plugin, bool is_input);
 
    // Get info about an audio port.
    // Returns true on success and stores the result into info.
-   // [main-thread]
+   // [main-thread & !active]
    bool(CLAP_ABI *get)(const clap_plugin_t    *plugin,
                        uint32_t                index,
                        bool                    is_input,
diff --git a/include/clap/ext/note-ports.h b/include/clap/ext/note-ports.h
index f91b527f..4b43f153 100644
--- a/include/clap/ext/note-ports.h
+++ b/include/clap/ext/note-ports.h
@@ -38,15 +38,14 @@ typedef struct clap_note_port_info {
    char     name[CLAP_NAME_SIZE]; // displayable name, i18n?
 } clap_note_port_info_t;
 
-// The note ports scan has to be done while the plugin is deactivated.
 typedef struct clap_plugin_note_ports {
    // Number of ports, for either input or output.
-   // [main-thread]
+   // [main-thread & !active]
    uint32_t(CLAP_ABI *count)(const clap_plugin_t *plugin, bool is_input);
 
    // Get info about a note port.
    // Returns true on success and stores the result into info.
-   // [main-thread]
+   // [main-thread & !active]
    bool(CLAP_ABI *get)(const clap_plugin_t   *plugin,
                        uint32_t               index,
                        bool                   is_input,
diff --git a/include/clap/ext/thread-pool.h b/include/clap/ext/thread-pool.h
index 790bef90..6f4d268c 100644
--- a/include/clap/ext/thread-pool.h
+++ b/include/clap/ext/thread-pool.h
@@ -57,7 +57,7 @@ typedef struct clap_host_thread_pool {
    // Returns true if the host did execute all the tasks, false if it rejected the request.
    // The host should check that the plugin is within the process call, and if not, reject the exec
    // request.
-   // [audio-thread]
+   // [audio-thread & active & processing]
    bool(CLAP_ABI *request_exec)(const clap_host_t *host, uint32_t num_tasks);
 } clap_host_thread_pool_t;
 
diff --git a/include/clap/plugin.h b/include/clap/plugin.h
index 97ead816..7c379d40 100644
--- a/include/clap/plugin.h
+++ b/include/clap/plugin.h
@@ -60,21 +60,21 @@ typedef struct clap_plugin {
    // the [min, max] range, which is bounded by [1, INT32_MAX].
    // Once activated the latency and port configuration must remain constant, until deactivation.
    // Returns true on success.
-   // [main-thread & !active_state]
+   // [main-thread & !active]
    bool(CLAP_ABI *activate)(const struct clap_plugin *plugin,
                             double                    sample_rate,
                             uint32_t                  min_frames_count,
                             uint32_t                  max_frames_count);
-   // [main-thread & active_state]
+   // [main-thread & active]
    void(CLAP_ABI *deactivate)(const struct clap_plugin *plugin);
 
    // Call start processing before processing.
    // Returns true on success.
-   // [audio-thread & active_state & !processing_state]
+   // [audio-thread & active & !processing]
    bool(CLAP_ABI *start_processing)(const struct clap_plugin *plugin);
 
    // Call stop processing before sending the plugin to sleep.
-   // [audio-thread & active_state & processing_state]
+   // [audio-thread & active & processing]
    void(CLAP_ABI *stop_processing)(const struct clap_plugin *plugin);
 
    // - Clears all buffers, performs a full reset of the processing state (filters, oscillators,
@@ -82,13 +82,13 @@ typedef struct clap_plugin {
    // - The parameter's value remain unchanged.
    // - clap_process.steady_time may jump backward.
    //
-   // [audio-thread & active_state]
+   // [audio-thread & active]
    void(CLAP_ABI *reset)(const struct clap_plugin *plugin);
 
    // process audio, events, ...
    // All the pointers coming from clap_process_t and its nested attributes,
    // are valid until process() returns.
-   // [audio-thread & active_state & processing_state]
+   // [audio-thread & active & processing]
    clap_process_status(CLAP_ABI *process)(const struct clap_plugin *plugin,
                                           const clap_process_t     *process);