diff --git a/csharp/ql/src/Metrics/Callables/CCyclomaticComplexity.ql b/csharp/ql/src/Metrics/Callables/CCyclomaticComplexity.ql
index bf78f5d31730..67e06f0541c6 100644
--- a/csharp/ql/src/Metrics/Callables/CCyclomaticComplexity.ql
+++ b/csharp/ql/src/Metrics/Callables/CCyclomaticComplexity.ql
@@ -8,7 +8,7 @@
  * @tags testability
  *       complexity
  *       maintainability
- * @deprecated
+ * @id cs/cyclomatic-complexity-per-function
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Callables/CLinesOfCode.ql b/csharp/ql/src/Metrics/Callables/CLinesOfCode.ql
index 8c4f1539de49..e276b8f1272f 100644
--- a/csharp/ql/src/Metrics/Callables/CLinesOfCode.ql
+++ b/csharp/ql/src/Metrics/Callables/CLinesOfCode.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg sum max
  * @tags maintainability
  *       complexity
- * @deprecated
+ * @id cs/lines-of-code-per-function
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Callables/CLinesOfComment.ql b/csharp/ql/src/Metrics/Callables/CLinesOfComment.ql
index c7d7b6714e16..a31881c95ff5 100644
--- a/csharp/ql/src/Metrics/Callables/CLinesOfComment.ql
+++ b/csharp/ql/src/Metrics/Callables/CLinesOfComment.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg sum max
  * @tags maintainability
  *       documentation
- * @deprecated
+ * @id cs/lines-of-comment-per-function
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Callables/CNumberOfParameters.ql b/csharp/ql/src/Metrics/Callables/CNumberOfParameters.ql
index cb2856fa91c3..940efe9c9498 100644
--- a/csharp/ql/src/Metrics/Callables/CNumberOfParameters.ql
+++ b/csharp/ql/src/Metrics/Callables/CNumberOfParameters.ql
@@ -8,7 +8,7 @@
  * @tags testability
  *       complexity
  *       maintainability
- * @deprecated
+ * @id cs/parameters-per-function
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Callables/CNumberOfStatements.ql b/csharp/ql/src/Metrics/Callables/CNumberOfStatements.ql
index 97d387646702..0954c7d553d3 100644
--- a/csharp/ql/src/Metrics/Callables/CNumberOfStatements.ql
+++ b/csharp/ql/src/Metrics/Callables/CNumberOfStatements.ql
@@ -7,7 +7,7 @@
  * @metricType callable
  * @metricAggregate avg sum max
  * @tags maintainability
- * @deprecated
+ * @id cs/statements-per-function
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Callables/CPercentageOfComments.ql b/csharp/ql/src/Metrics/Callables/CPercentageOfComments.ql
index 51aa87bee31c..55a23f6614f2 100644
--- a/csharp/ql/src/Metrics/Callables/CPercentageOfComments.ql
+++ b/csharp/ql/src/Metrics/Callables/CPercentageOfComments.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg max
  * @tags maintainability
  *       documentation
- * @deprecated
+ * @id cs/comment-ratio-per-type
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Callables/StatementNestingDepth.ql b/csharp/ql/src/Metrics/Callables/StatementNestingDepth.ql
index 29d62c62fe64..123103e1f526 100644
--- a/csharp/ql/src/Metrics/Callables/StatementNestingDepth.ql
+++ b/csharp/ql/src/Metrics/Callables/StatementNestingDepth.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg max
  * @tags maintainability
  *       complexity
- * @deprecated
+ * @id cs/statement-nesting-depth-per-function
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Files/FCommentRatio.ql b/csharp/ql/src/Metrics/Files/FCommentRatio.ql
index 04cc71610d11..a1ce1874aea8 100644
--- a/csharp/ql/src/Metrics/Files/FCommentRatio.ql
+++ b/csharp/ql/src/Metrics/Files/FCommentRatio.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg max
  * @tags maintainability
  *       documentation
- * @deprecated
+ * @id cs/comment-ratio-per-file
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Files/FCyclomaticComplexity.ql b/csharp/ql/src/Metrics/Files/FCyclomaticComplexity.ql
index f27cda03524f..e36bec078b80 100644
--- a/csharp/ql/src/Metrics/Files/FCyclomaticComplexity.ql
+++ b/csharp/ql/src/Metrics/Files/FCyclomaticComplexity.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg max
  * @tags testability
  *       complexity
- * @deprecated
+ * @id cs/average-cyclomatic-complexity-per-file
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Files/FLines.ql b/csharp/ql/src/Metrics/Files/FLines.ql
index f63c551e2e3b..04c908c15ce0 100644
--- a/csharp/ql/src/Metrics/Files/FLines.ql
+++ b/csharp/ql/src/Metrics/Files/FLines.ql
@@ -5,7 +5,7 @@
  * @treemap.warnOn highValues
  * @metricType file
  * @metricAggregate avg sum max
- * @deprecated
+ * @id cs/lines-per-file
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Files/FNumberOfClasses.ql b/csharp/ql/src/Metrics/Files/FNumberOfClasses.ql
index bddac7a516c5..225b440fa4a2 100644
--- a/csharp/ql/src/Metrics/Files/FNumberOfClasses.ql
+++ b/csharp/ql/src/Metrics/Files/FNumberOfClasses.ql
@@ -6,7 +6,7 @@
  * @metricType file
  * @metricAggregate avg sum max
  * @tags maintainability
- * @deprecated
+ * @id cs/classes-per-file
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Files/FNumberOfInterfaces.ql b/csharp/ql/src/Metrics/Files/FNumberOfInterfaces.ql
index 6af16b6fe088..5b173ccedb2f 100644
--- a/csharp/ql/src/Metrics/Files/FNumberOfInterfaces.ql
+++ b/csharp/ql/src/Metrics/Files/FNumberOfInterfaces.ql
@@ -6,7 +6,7 @@
  * @metricType file
  * @metricAggregate avg sum max
  * @tags maintainability
- * @deprecated
+ * @id cs/interfaces-per-file
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Files/FNumberOfStructs.ql b/csharp/ql/src/Metrics/Files/FNumberOfStructs.ql
index fd85b3b23925..011bc5b4db0d 100644
--- a/csharp/ql/src/Metrics/Files/FNumberOfStructs.ql
+++ b/csharp/ql/src/Metrics/Files/FNumberOfStructs.ql
@@ -6,7 +6,7 @@
  * @metricType file
  * @metricAggregate avg sum max
  * @tags maintainability
- * @deprecated
+ * @id cs/structs-per-file
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Files/FNumberOfUsingNamespaces.ql b/csharp/ql/src/Metrics/Files/FNumberOfUsingNamespaces.ql
index f0ea74b6cb84..41c05e0dca6e 100644
--- a/csharp/ql/src/Metrics/Files/FNumberOfUsingNamespaces.ql
+++ b/csharp/ql/src/Metrics/Files/FNumberOfUsingNamespaces.ql
@@ -6,7 +6,7 @@
  * @metricType file
  * @metricAggregate avg sum max
  * @tags maintainability
- * @deprecated
+ * @id cs/using-namespaces-per-file
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/Files/FSelfContainedness.ql b/csharp/ql/src/Metrics/Files/FSelfContainedness.ql
index 3768eb47c4b4..9c96255e0646 100644
--- a/csharp/ql/src/Metrics/Files/FSelfContainedness.ql
+++ b/csharp/ql/src/Metrics/Files/FSelfContainedness.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg max
  * @tags portability
  *       modularity
- * @deprecated
+ * @id cs/source-dependency-ratio-per-file
  */
 import csharp
 import semmle.code.csharp.metrics.Coupling
diff --git a/csharp/ql/src/Metrics/History/HChurn.ql b/csharp/ql/src/Metrics/History/HChurn.ql
index 7e6942a1f270..8a433dfb0fde 100644
--- a/csharp/ql/src/Metrics/History/HChurn.ql
+++ b/csharp/ql/src/Metrics/History/HChurn.ql
@@ -5,7 +5,7 @@
  * @treemap.warnOn highValues
  * @metricType file
  * @metricAggregate avg sum max
- * @deprecated
+ * @id cs/vcs/churn-per-file
  */
 import csharp
 import external.VCS
diff --git a/csharp/ql/src/Metrics/History/HLinesAdded.ql b/csharp/ql/src/Metrics/History/HLinesAdded.ql
index 257ed493adc7..2a96ae9b129f 100644
--- a/csharp/ql/src/Metrics/History/HLinesAdded.ql
+++ b/csharp/ql/src/Metrics/History/HLinesAdded.ql
@@ -5,7 +5,7 @@
  * @treemap.warnOn highValues
  * @metricType file
  * @metricAggregate avg sum max
- * @deprecated
+ * @id cs/vcs/added-lines-per-file
  */
 import csharp
 import external.VCS
diff --git a/csharp/ql/src/Metrics/History/HLinesDeleted.ql b/csharp/ql/src/Metrics/History/HLinesDeleted.ql
index 44e6927df3b5..f231a5152562 100644
--- a/csharp/ql/src/Metrics/History/HLinesDeleted.ql
+++ b/csharp/ql/src/Metrics/History/HLinesDeleted.ql
@@ -5,7 +5,7 @@
  * @treemap.warnOn highValues
  * @metricType file
  * @metricAggregate avg sum max
- * @deprecated
+ * @id cs/vcs/deleted-lines-per-file
  */
 import csharp
 import external.VCS
diff --git a/csharp/ql/src/Metrics/History/HNumberOfAuthors.ql b/csharp/ql/src/Metrics/History/HNumberOfAuthors.ql
index f1acc939cfe0..5bcfd049e151 100644
--- a/csharp/ql/src/Metrics/History/HNumberOfAuthors.ql
+++ b/csharp/ql/src/Metrics/History/HNumberOfAuthors.ql
@@ -5,7 +5,7 @@
  * @treemap.warnOn highValues
  * @metricType file
  * @metricAggregate avg min max
- * @deprecated
+ * @id cs/vcs/authors-per-file
  */
 import csharp
 import external.VCS
diff --git a/csharp/ql/src/Metrics/History/HNumberOfChanges.ql b/csharp/ql/src/Metrics/History/HNumberOfChanges.ql
index 955c2de1e87a..47e0d8ff720f 100644
--- a/csharp/ql/src/Metrics/History/HNumberOfChanges.ql
+++ b/csharp/ql/src/Metrics/History/HNumberOfChanges.ql
@@ -5,7 +5,7 @@
  * @treemap.warnOn highValues
  * @metricType file
  * @metricAggregate avg min max sum
- * @deprecated
+ * @id cs/vcs/commits-per-file
  */
 import csharp
 import external.VCS
diff --git a/csharp/ql/src/Metrics/History/HNumberOfCoCommits.ql b/csharp/ql/src/Metrics/History/HNumberOfCoCommits.ql
index 9d6eba12fe65..dfdd7d535390 100644
--- a/csharp/ql/src/Metrics/History/HNumberOfCoCommits.ql
+++ b/csharp/ql/src/Metrics/History/HNumberOfCoCommits.ql
@@ -5,7 +5,7 @@
  * @treemap.warnOn highValues
  * @metricType file
  * @metricAggregate avg min max
- * @deprecated
+ * @id cs/vcs/co-commits-per-file
  */
 import csharp
 import external.VCS
diff --git a/csharp/ql/src/Metrics/History/HNumberOfReCommits.ql b/csharp/ql/src/Metrics/History/HNumberOfReCommits.ql
index 2848b252c45f..3c0f4c2a99d9 100644
--- a/csharp/ql/src/Metrics/History/HNumberOfReCommits.ql
+++ b/csharp/ql/src/Metrics/History/HNumberOfReCommits.ql
@@ -5,7 +5,7 @@
  * @treemap.warnOn highValues
  * @metricType file
  * @metricAggregate avg min max
- * @deprecated
+ * @id cs/vcs/recommits-per-file
  */
 import csharp
 import external.VCS
diff --git a/csharp/ql/src/Metrics/History/HNumberOfRecentChanges.ql b/csharp/ql/src/Metrics/History/HNumberOfRecentChanges.ql
index b52445ae147c..403d3521b4a3 100644
--- a/csharp/ql/src/Metrics/History/HNumberOfRecentChanges.ql
+++ b/csharp/ql/src/Metrics/History/HNumberOfRecentChanges.ql
@@ -5,7 +5,7 @@
  * @treemap.warnOn highValues
  * @metricType file
  * @metricAggregate avg min max sum
- * @deprecated
+ * @id cs/vcs/recent-commits-per-file
  */
 import csharp
 import external.VCS
diff --git a/csharp/ql/src/Metrics/RefTypes/TAfferentCoupling.ql b/csharp/ql/src/Metrics/RefTypes/TAfferentCoupling.ql
index 1a379ef82af9..44f8c6628193 100644
--- a/csharp/ql/src/Metrics/RefTypes/TAfferentCoupling.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TAfferentCoupling.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg max
  * @tags changeability
  *       modularity
- * @deprecated
+ * @id cs/incoming-type-dependencies
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TEfferentCoupling.ql b/csharp/ql/src/Metrics/RefTypes/TEfferentCoupling.ql
index 17af750547c8..7af616ebb1c2 100644
--- a/csharp/ql/src/Metrics/RefTypes/TEfferentCoupling.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TEfferentCoupling.ql
@@ -8,7 +8,7 @@
  * @tags testability
  *       modularity
  *       maintainability
- * @deprecated
+ * @id cs/outgoing-type-dependencies
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TInheritanceDepth.ql b/csharp/ql/src/Metrics/RefTypes/TInheritanceDepth.ql
index 87d190fd014d..986104817e82 100644
--- a/csharp/ql/src/Metrics/RefTypes/TInheritanceDepth.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TInheritanceDepth.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg max
  * @tags changeability
  *       modularity
- * @deprecated
+ * @id cs/inheritance-depth
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TLackOfCohesionCK.ql b/csharp/ql/src/Metrics/RefTypes/TLackOfCohesionCK.ql
index 2d4b20559df1..b18b40d4559e 100644
--- a/csharp/ql/src/Metrics/RefTypes/TLackOfCohesionCK.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TLackOfCohesionCK.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg max
  * @tags modularity
  *       maintainability
- * @deprecated
+ * @id cs/lack-of-cohesion-ck
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TLackOfCohesionHS.ql b/csharp/ql/src/Metrics/RefTypes/TLackOfCohesionHS.ql
index ed986ca15979..0fda99846e64 100644
--- a/csharp/ql/src/Metrics/RefTypes/TLackOfCohesionHS.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TLackOfCohesionHS.ql
@@ -6,7 +6,7 @@
  * @metricType reftype
  * @metricAggregate avg max
  * @tags modularity
- * @deprecated
+ * @id cs/lack-of-cohesion-hs
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TNumberOfCallables.ql b/csharp/ql/src/Metrics/RefTypes/TNumberOfCallables.ql
index 84432cef6285..d0ca7c52cd99 100644
--- a/csharp/ql/src/Metrics/RefTypes/TNumberOfCallables.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TNumberOfCallables.ql
@@ -6,7 +6,7 @@
  * @metricType reftype
  * @metricAggregate avg sum max
  * @tags maintainability
- * @deprecated
+ * @id cs/functions-per-type
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TNumberOfEvents.ql b/csharp/ql/src/Metrics/RefTypes/TNumberOfEvents.ql
index 15aed5026960..549d859158d0 100644
--- a/csharp/ql/src/Metrics/RefTypes/TNumberOfEvents.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TNumberOfEvents.ql
@@ -6,7 +6,7 @@
  * @metricType reftype
  * @metricAggregate avg sum max
  * @tags maintainability
- * @deprecated
+ * @id cs/events-per-type
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TNumberOfFields.ql b/csharp/ql/src/Metrics/RefTypes/TNumberOfFields.ql
index 3deda014a47e..a4e82f1f9e47 100644
--- a/csharp/ql/src/Metrics/RefTypes/TNumberOfFields.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TNumberOfFields.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg sum max
  * @tags maintainability
  *       complexity
- * @deprecated
+ * @id cs/fields-per-type
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TNumberOfIndexers.ql b/csharp/ql/src/Metrics/RefTypes/TNumberOfIndexers.ql
index 595656e17291..cbb3103bd432 100644
--- a/csharp/ql/src/Metrics/RefTypes/TNumberOfIndexers.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TNumberOfIndexers.ql
@@ -6,7 +6,7 @@
  * @metricType reftype
  * @metricAggregate avg sum max
  * @tags maintainability
- * @deprecated
+ * @id cs/indexers-per-type
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TNumberOfNonConstFields.ql b/csharp/ql/src/Metrics/RefTypes/TNumberOfNonConstFields.ql
index 888772b395dc..09ca1910bcac 100644
--- a/csharp/ql/src/Metrics/RefTypes/TNumberOfNonConstFields.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TNumberOfNonConstFields.ql
@@ -5,7 +5,7 @@
  * @treemap.warnOn highValues
  * @metricType reftype
  * @metricAggregate avg sum max
- * @deprecated
+ * @id cs/nonconst-fields-per-type
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TNumberOfProperties.ql b/csharp/ql/src/Metrics/RefTypes/TNumberOfProperties.ql
index a57dd15b83f3..8bd3394a535a 100644
--- a/csharp/ql/src/Metrics/RefTypes/TNumberOfProperties.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TNumberOfProperties.ql
@@ -6,7 +6,7 @@
  * @metricType reftype
  * @metricAggregate avg sum max
  * @tags maintainability
- * @deprecated
+ * @id cs/properties-per-type
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TNumberOfStatements.ql b/csharp/ql/src/Metrics/RefTypes/TNumberOfStatements.ql
index 09123e4b19d4..df6e9bb45ab0 100644
--- a/csharp/ql/src/Metrics/RefTypes/TNumberOfStatements.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TNumberOfStatements.ql
@@ -6,7 +6,7 @@
  * @metricType reftype
  * @metricAggregate avg sum max
  * @tags maintainability
- * @deprecated
+ * @id cs/statements-per-type
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TResponse.ql b/csharp/ql/src/Metrics/RefTypes/TResponse.ql
index cc053fd52245..2d3d2fabceb9 100644
--- a/csharp/ql/src/Metrics/RefTypes/TResponse.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TResponse.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg max
  * @tags maintainability
  *       complexity
- * @deprecated
+ * @id cs/response-per-type
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TSizeOfAPI.ql b/csharp/ql/src/Metrics/RefTypes/TSizeOfAPI.ql
index a8635c28dcec..cf93e2e33599 100644
--- a/csharp/ql/src/Metrics/RefTypes/TSizeOfAPI.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TSizeOfAPI.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg sum max
  * @tags testability
  *       modularity
- * @deprecated
+ * @id cs/public-functions-per-type
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TSpecialisationIndex.ql b/csharp/ql/src/Metrics/RefTypes/TSpecialisationIndex.ql
index b7ceb9065ed6..d6b8b66fd976 100644
--- a/csharp/ql/src/Metrics/RefTypes/TSpecialisationIndex.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TSpecialisationIndex.ql
@@ -7,7 +7,7 @@
  * @metricAggregate avg max
  * @tags modularity
  *       maintainability
- * @deprecated
+ * @id cs/type-specialization-index
  */
 import csharp
 
diff --git a/csharp/ql/src/Metrics/RefTypes/TUnmanagedCode.ql b/csharp/ql/src/Metrics/RefTypes/TUnmanagedCode.ql
index 43c9e3fa550b..aac1c3c567f9 100644
--- a/csharp/ql/src/Metrics/RefTypes/TUnmanagedCode.ql
+++ b/csharp/ql/src/Metrics/RefTypes/TUnmanagedCode.ql
@@ -6,7 +6,7 @@
  * @metricType reftype
  * @metricAggregate sum
  * @tags reliability
- * @deprecated
+ * @id cs/externs-per-type
  */
 
 import csharp
diff --git a/csharp/ql/src/filters/ChangedLines.ql b/csharp/ql/src/filters/ChangedLines.ql
index f197bc6c130f..dcc3c0b7467d 100644
--- a/csharp/ql/src/filters/ChangedLines.ql
+++ b/csharp/ql/src/filters/ChangedLines.ql
@@ -1,7 +1,7 @@
 /**
  * @name Filter: only keep results from source that have been changed since the base line
  * @description Exclude results that have not changed since the base line.
- * @deprecated
+ * @id cs/changed-lines-filter
  * @kind problem
  */
 import csharp
diff --git a/csharp/ql/src/filters/ChangedLinesForMetric.ql b/csharp/ql/src/filters/ChangedLinesForMetric.ql
index 250967ecacab..acbe17ac10be 100644
--- a/csharp/ql/src/filters/ChangedLinesForMetric.ql
+++ b/csharp/ql/src/filters/ChangedLinesForMetric.ql
@@ -1,7 +1,7 @@
 /**
  * @name Filter: only keep results from source that have been changed since the base line
  * @description Exclude results that have not changed since the base line.
- * @deprecated
+ * @id cs/changed-lines-metric-filter
  * @kind treemap
  */
 import csharp
diff --git a/csharp/ql/src/filters/FromSource.ql b/csharp/ql/src/filters/FromSource.ql
index 49e143bcfabd..bfb6be8f11ef 100644
--- a/csharp/ql/src/filters/FromSource.ql
+++ b/csharp/ql/src/filters/FromSource.ql
@@ -2,7 +2,7 @@
  * @name Filter: only keep results from source
  * @description Exclude results that do not come from source code files.
  * @kind problem
- * @deprecated
+ * @id cs/source-filter
  */
 import csharp
 import external.DefectFilter
diff --git a/csharp/ql/src/filters/FromSourceForMetric.ql b/csharp/ql/src/filters/FromSourceForMetric.ql
index cc5d56fff684..e275d904df36 100644
--- a/csharp/ql/src/filters/FromSourceForMetric.ql
+++ b/csharp/ql/src/filters/FromSourceForMetric.ql
@@ -2,7 +2,7 @@
  * @name Filter: only keep metric results from source
  * @description Exclude results that do not come from source code files.
  * @kind treemap
- * @deprecated
+ * @id cs/source-metric-filter
  */
 import csharp
 import external.MetricFilter
diff --git a/csharp/ql/src/filters/NotGenerated.ql b/csharp/ql/src/filters/NotGenerated.ql
index 6ee0324701ec..a55332b509ec 100644
--- a/csharp/ql/src/filters/NotGenerated.ql
+++ b/csharp/ql/src/filters/NotGenerated.ql
@@ -2,7 +2,7 @@
  * @name Filter: only keep results in non-generated files
  * @description Exclude results that come from generated code.
  * @kind problem
- * @deprecated
+ * @id cs/not-generated-file-filter
  */
 import semmle.code.csharp.commons.GeneratedCode
 import external.DefectFilter
diff --git a/csharp/ql/src/filters/NotGeneratedForMetric.ql b/csharp/ql/src/filters/NotGeneratedForMetric.ql
index 90c65e1b5792..5d2ce663de8f 100644
--- a/csharp/ql/src/filters/NotGeneratedForMetric.ql
+++ b/csharp/ql/src/filters/NotGeneratedForMetric.ql
@@ -2,7 +2,7 @@
  * @name Filter: only keep metric results in non-generated files
  * @description Exclude results that come from generated code.
  * @kind treemap
- * @deprecated
+ * @id cs/not-generated-file-metric-filter
  */
 import semmle.code.csharp.commons.GeneratedCode
 import external.MetricFilter
diff --git a/csharp/ql/src/filters/NotInTestFile.ql b/csharp/ql/src/filters/NotInTestFile.ql
index 09e31ba39504..db1da42d8ee5 100644
--- a/csharp/ql/src/filters/NotInTestFile.ql
+++ b/csharp/ql/src/filters/NotInTestFile.ql
@@ -2,7 +2,7 @@
  * @name Filter: only keep results that are outside of test files
  * @description Exclude results in test files.
  * @kind problem
- * @deprecated
+ * @id cs/test-file-filter
  */
 import csharp
 import semmle.code.csharp.frameworks.Test
diff --git a/csharp/ql/src/filters/NotInTestFileForMetric.ql b/csharp/ql/src/filters/NotInTestFileForMetric.ql
index 7cdcf441a5a1..03529f6067c2 100644
--- a/csharp/ql/src/filters/NotInTestFileForMetric.ql
+++ b/csharp/ql/src/filters/NotInTestFileForMetric.ql
@@ -2,7 +2,7 @@
  * @name Filter: only keep results that are outside of test files
  * @description Exclude results in test files.
  * @kind treemap
- * @deprecated
+ * @id cs/test-file-metric-filter
  */
 import csharp
 import semmle.code.csharp.frameworks.Test
diff --git a/csharp/ql/src/filters/NotInTestMethod.ql b/csharp/ql/src/filters/NotInTestMethod.ql
index 2196cb9d8374..38ecd572fba5 100644
--- a/csharp/ql/src/filters/NotInTestMethod.ql
+++ b/csharp/ql/src/filters/NotInTestMethod.ql
@@ -2,7 +2,7 @@
  * @name Filter: only keep results that are outside of test methods
  * @description Exclude results in test methods.
  * @kind problem
- * @deprecated
+ * @id cs/test-method-filter
  */
 import csharp
 import semmle.code.csharp.frameworks.Test
diff --git a/csharp/ql/src/filters/NotInTestMethodExpectingException.ql b/csharp/ql/src/filters/NotInTestMethodExpectingException.ql
index 42479cadb58b..175579bfbeca 100644
--- a/csharp/ql/src/filters/NotInTestMethodExpectingException.ql
+++ b/csharp/ql/src/filters/NotInTestMethodExpectingException.ql
@@ -2,7 +2,7 @@
  * @name Filter: only keep results that are outside of a test method expecting an exception
  * @description Exclude results in test methods expecting exceptions.
  * @kind problem
- * @deprecated
+ * @id cs/test-method-exception-filter
  */
 import csharp
 import semmle.code.csharp.frameworks.Test
diff --git a/csharp/ql/src/filters/RecentDefects.ql b/csharp/ql/src/filters/RecentDefects.ql
index 2ad071193f7a..ff73ead990d0 100644
--- a/csharp/ql/src/filters/RecentDefects.ql
+++ b/csharp/ql/src/filters/RecentDefects.ql
@@ -2,7 +2,7 @@
  * @name Filter: only files recently edited
  * @description Filter a defect query to only include results in files that have been changed recently, and modify the message.
  * @kind problem
- * @deprecated
+ * @id cs/recently-changed-file-filter
  */
 import csharp
 import external.DefectFilter
diff --git a/csharp/ql/src/filters/UnchangedLines.ql b/csharp/ql/src/filters/UnchangedLines.ql
index b152bfae38f6..f6ff210c15cf 100644
--- a/csharp/ql/src/filters/UnchangedLines.ql
+++ b/csharp/ql/src/filters/UnchangedLines.ql
@@ -2,7 +2,7 @@
  * @name Filter: only keep results from source that have not changed since the base line
  * @description Complement of ChangedLines.ql.
  * @kind problem
- * @deprecated
+ * @id cs/unchanged-lines-filter
  */
 import csharp
 import external.ExternalArtifact
diff --git a/csharp/ql/src/filters/UnchangedLinesForMetric.ql b/csharp/ql/src/filters/UnchangedLinesForMetric.ql
index 1ab94b0e32fd..cbb222a9a23f 100644
--- a/csharp/ql/src/filters/UnchangedLinesForMetric.ql
+++ b/csharp/ql/src/filters/UnchangedLinesForMetric.ql
@@ -2,7 +2,7 @@
  * @name Filter: only keep results from source that have not changed since the base line
  * @description Complement of ChangedLinesForMetric.ql.
  * @kind treemap
- * @deprecated
+ * @id cs/unchanged-lines-metric-filter
  */
 import csharp
 import external.ExternalArtifact