Merge pull request #11691 from michaelnebel/renameextensibles

C#/Java: Rename externalflow extensible predicates
2026-04-30 11:15:13 +02:00 · 2022-12-15 11:05:22 +01:00
parent 33955ee4ab 12c1ebd81c
commit a67e02df21
287 changed files with 508 additions and 483 deletions
--- a/csharp/ql/lib/ext/Dapper.model.yml
+++ b/csharp/ql/lib/ext/Dapper.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["Dapper", "SqlMapper", False, "Execute", "(System.Data.IDbConnection,System.String,System.Object,System.Data.IDbTransaction,System.Nullable<System.Int32>,System.Nullable<System.Data.CommandType>)", "", "Argument[1]", "sql", "manual"]
      - ["Dapper", "SqlMapper", False, "ExecuteAsync", "(System.Data.IDbConnection,System.String,System.Object,System.Data.IDbTransaction,System.Nullable<System.Int32>,System.Nullable<System.Data.CommandType>)", "", "Argument[1]", "sql", "manual"]
--- a/csharp/ql/lib/ext/Microsoft.ApplicationBlocks.Data.model.yml
+++ b/csharp/ql/lib/ext/Microsoft.ApplicationBlocks.Data.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["Microsoft.ApplicationBlocks.Data", "SqlHelper", False, "ExecuteDataset", "(System.Data.SqlClient.SqlConnection,System.Data.CommandType,System.String)", "", "Argument[2]", "sql", "manual"]
      - ["Microsoft.ApplicationBlocks.Data", "SqlHelper", False, "ExecuteDataset", "(System.Data.SqlClient.SqlConnection,System.Data.CommandType,System.String,System.Data.SqlClient.SqlParameter[])", "", "Argument[2]", "sql", "manual"]
--- a/csharp/ql/lib/ext/Microsoft.EntityFrameworkCore.model.yml
+++ b/csharp/ql/lib/ext/Microsoft.EntityFrameworkCore.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["Microsoft.EntityFrameworkCore", "RelationalDatabaseFacadeExtensions", False, "ExecuteSqlRaw", "(Microsoft.EntityFrameworkCore.Infrastructure.DatabaseFacade,System.String,System.Collections.Generic.IEnumerable<System.Object>)", "", "Argument[1]", "sql", "manual"]
      - ["Microsoft.EntityFrameworkCore", "RelationalDatabaseFacadeExtensions", False, "ExecuteSqlRaw", "(Microsoft.EntityFrameworkCore.Infrastructure.DatabaseFacade,System.String,System.Object[])", "", "Argument[1]", "sql", "manual"]
--- a/csharp/ql/lib/ext/Microsoft.Extensions.Primitives.model.yml
+++ b/csharp/ql/lib/ext/Microsoft.Extensions.Primitives.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["Microsoft.Extensions.Primitives", "StringValues", False, "Add", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
      - ["Microsoft.Extensions.Primitives", "StringValues", False, "Add", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
--- a/csharp/ql/lib/ext/Microsoft.VisualBasic.model.yml
+++ b/csharp/ql/lib/ext/Microsoft.VisualBasic.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["Microsoft.VisualBasic", "Collection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
      - ["Microsoft.VisualBasic", "Collection", False, "GetEnumerator", "()", "", "Argument[this].Element", "ReturnValue.Property[System.Collections.IEnumerator.Current]", "value", "manual"]
--- a/csharp/ql/lib/ext/MySql.Data.MySqlClient.model.yml
+++ b/csharp/ql/lib/ext/MySql.Data.MySqlClient.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["MySql.Data.MySqlClient", "MySqlHelper", False, "ExecuteDataRow", "(System.String,System.String,MySql.Data.MySqlClient.MySqlParameter[])", "", "Argument[1]", "sql", "manual"]
      - ["MySql.Data.MySqlClient", "MySqlHelper", False, "ExecuteDataRowAsync", "(System.String,System.String,MySql.Data.MySqlClient.MySqlParameter[])", "", "Argument[1]", "sql", "manual"]
--- a/csharp/ql/lib/ext/Newtonsoft.Json.Linq.model.yml
+++ b/csharp/ql/lib/ext/Newtonsoft.Json.Linq.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["Newtonsoft.Json.Linq", "JArray", False, "get_Item", "(System.Object)", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
      - ["Newtonsoft.Json.Linq", "JArray", False, "set_Item", "(System.Object,Newtonsoft.Json.Linq.JToken)", "", "Argument[1]", "Argument[this].Element", "value", "manual"]
--- a/csharp/ql/lib/ext/Newtonsoft.Json.model.yml
+++ b/csharp/ql/lib/ext/Newtonsoft.Json.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["Newtonsoft.Json", "JsonConvert", False, "DeserializeAnonymousType<>", "(System.String,T)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
      - ["Newtonsoft.Json", "JsonConvert", False, "DeserializeAnonymousType<>", "(System.String,T,Newtonsoft.Json.JsonSerializerSettings)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
--- a/csharp/ql/lib/ext/ServiceStack.OrmLite.model.yml
+++ b/csharp/ql/lib/ext/ServiceStack.OrmLite.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["ServiceStack.OrmLite", "IUntypedSqlExpression", True, "UnsafeAnd", "(System.String,System.Object[])", "", "Argument[0]", "sql", "manual"]
      - ["ServiceStack.OrmLite", "IUntypedSqlExpression", True, "UnsafeFrom", "(System.String)", "", "Argument[0]", "sql", "manual"]
--- a/csharp/ql/lib/ext/ServiceStack.Redis.model.yml
+++ b/csharp/ql/lib/ext/ServiceStack.Redis.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["ServiceStack.Redis", "IRedisClient", True, "Custom", "(System.Object[])", "", "Argument[0]", "code", "manual"]
      - ["ServiceStack.Redis", "IRedisClient", True, "ExecCachedLua", "(System.String,System.Func<System.String,T>)", "", "Argument[0]", "code", "manual"]
--- a/csharp/ql/lib/ext/ServiceStack.model.yml
+++ b/csharp/ql/lib/ext/ServiceStack.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["ServiceStack", "IOneWayClient", True, "SendAllOneWay", "(System.Collections.Generic.IEnumerable<System.Object>)", "", "Argument[1].Element", "remote", "manual"]
      - ["ServiceStack", "IOneWayClient", True, "SendOneWay", "(System.Object)", "", "Argument[0]", "remote", "manual"]
@@ -80,7 +80,7 @@ extensions:
      - ["ServiceStack", "ServiceClientBase", True, "Put", "(System.Object)", "", "Argument[0]", "remote", "manual"]
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["ServiceStack", "HttpResult", False, "HttpResult", "(System.Byte[],System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
      - ["ServiceStack", "HttpResult", False, "HttpResult", "(System.IO.Stream,System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
--- a/csharp/ql/lib/ext/System.CodeDom.model.yml
+++ b/csharp/ql/lib/ext/System.CodeDom.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.CodeDom", "CodeNamespaceImportCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Collections.Concurrent.model.yml
+++ b/csharp/ql/lib/ext/System.Collections.Concurrent.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Collections.Concurrent", "BlockingCollection<>", False, "Add", "(T)", "", "Argument[0]", "Argument[this].Element", "value", "manual"]
      - ["System.Collections.Concurrent", "BlockingCollection<>", False, "CopyTo", "(T[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Collections.Generic.model.yml
+++ b/csharp/ql/lib/ext/System.Collections.Generic.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Collections.Generic", "Dictionary<,>", False, "Add", "(System.Collections.Generic.KeyValuePair<TKey,TValue>)", "", "Argument[0].Property[System.Collections.Generic.KeyValuePair<,>.Key]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair<,>.Key]", "value", "manual"]
      - ["System.Collections.Generic", "Dictionary<,>", False, "Add", "(System.Collections.Generic.KeyValuePair<TKey,TValue>)", "", "Argument[0].Property[System.Collections.Generic.KeyValuePair<,>.Value]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair<,>.Value]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Collections.Immutable.model.yml
+++ b/csharp/ql/lib/ext/System.Collections.Immutable.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Collections.Immutable", "IImmutableDictionary<,>", True, "AddRange", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey,TValue>>)", "", "Argument[0].Element", "Argument[this].Element", "value", "manual"]
      - ["System.Collections.Immutable", "IImmutableDictionary<,>", True, "Clear", "()", "", "Argument[this].WithoutElement", "ReturnValue", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Collections.ObjectModel.model.yml
+++ b/csharp/ql/lib/ext/System.Collections.ObjectModel.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Collections.ObjectModel", "KeyedCollection<,>", False, "get_Item", "(TKey)", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
      - ["System.Collections.ObjectModel", "ReadOnlyCollection<>", False, "get_Item", "(System.Int32)", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Collections.Specialized.model.yml
+++ b/csharp/ql/lib/ext/System.Collections.Specialized.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Collections.Specialized", "IOrderedDictionary", True, "get_Item", "(System.Int32)", "", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair<,>.Value]", "ReturnValue", "value", "manual"]
      - ["System.Collections.Specialized", "IOrderedDictionary", True, "set_Item", "(System.Int32,System.Object)", "", "Argument[0]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair<,>.Key]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Collections.model.yml
+++ b/csharp/ql/lib/ext/System.Collections.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Collections", "ArrayList", False, "AddRange", "(System.Collections.ICollection)", "", "Argument[0].Element", "Argument[this].Element", "value", "manual"]
      - ["System.Collections", "ArrayList", False, "Clone", "()", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"]
--- a/csharp/ql/lib/ext/System.ComponentModel.Design.model.yml
+++ b/csharp/ql/lib/ext/System.ComponentModel.Design.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.ComponentModel.Design", "DesignerCollection", False, "GetEnumerator", "()", "", "Argument[this].Element", "ReturnValue.Property[System.Collections.IEnumerator.Current]", "value", "manual"]
      - ["System.ComponentModel.Design", "DesignerOptionService+DesignerOptionCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
--- a/csharp/ql/lib/ext/System.ComponentModel.model.yml
+++ b/csharp/ql/lib/ext/System.ComponentModel.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.ComponentModel", "AttributeCollection", False, "GetEnumerator", "()", "", "Argument[this].Element", "ReturnValue.Property[System.Collections.IEnumerator.Current]", "value", "manual"]
      - ["System.ComponentModel", "ComponentCollection", False, "CopyTo", "(System.ComponentModel.IComponent[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Configuration.Provider.model.yml
+++ b/csharp/ql/lib/ext/System.Configuration.Provider.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Configuration.Provider", "ProviderCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Configuration.model.yml
+++ b/csharp/ql/lib/ext/System.Configuration.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Configuration", "CommaDelimitedStringCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
      - ["System.Configuration", "ConfigurationLockCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Data.Common.model.yml
+++ b/csharp/ql/lib/ext/System.Data.Common.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Data.Common", "DataColumnMappingCollection", False, "AddRange", "(System.Array)", "", "Argument[0].Element", "Argument[this].Element", "value", "manual"]
      - ["System.Data.Common", "DataColumnMappingCollection", False, "AddRange", "(System.Data.Common.DataColumnMapping[])", "", "Argument[0].Element", "Argument[this].Element", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Data.Entity.model.yml
+++ b/csharp/ql/lib/ext/System.Data.Entity.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["System.Data.Entity", "Database", False, "ExecuteSqlCommand", "(System.Data.Entity.TransactionalBehavior,System.String,System.Object[])", "", "Argument[1]", "sql", "manual"]
      - ["System.Data.Entity", "Database", False, "ExecuteSqlCommand", "(System.String,System.Object[])", "", "Argument[0]", "sql", "manual"]
--- a/csharp/ql/lib/ext/System.Data.EntityClient.model.yml
+++ b/csharp/ql/lib/ext/System.Data.EntityClient.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["System.Data.EntityClient", "EntityCommand", False, "EntityCommand", "(System.String)", "", "Argument[0]", "sql", "manual"]
      - ["System.Data.EntityClient", "EntityCommand", False, "EntityCommand", "(System.String,System.Data.EntityClient.EntityConnection)", "", "Argument[0]", "sql", "manual"]
--- a/csharp/ql/lib/ext/System.Data.Odbc.model.yml
+++ b/csharp/ql/lib/ext/System.Data.Odbc.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["System.Data.Odbc", "OdbcCommand", False, "OdbcCommand", "(System.String)", "", "Argument[0]", "sql", "manual"]
      - ["System.Data.Odbc", "OdbcCommand", False, "OdbcCommand", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[0]", "sql", "manual"]
--- a/csharp/ql/lib/ext/System.Data.OleDb.model.yml
+++ b/csharp/ql/lib/ext/System.Data.OleDb.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["System.Data.OleDb", "OleDbCommand", False, "OleDbCommand", "(System.String)", "", "Argument[0]", "sql", "manual"]
      - ["System.Data.OleDb", "OleDbCommand", False, "OleDbCommand", "(System.String,System.Data.OleDb.OleDbConnection)", "", "Argument[0]", "sql", "manual"]
--- a/csharp/ql/lib/ext/System.Data.SQLite.model.yml
+++ b/csharp/ql/lib/ext/System.Data.SQLite.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["System.Data.SQLite", "SQLiteCommand", False, "SQLiteCommand", "(System.String)", "", "Argument[0]", "sql", "manual"]
      - ["System.Data.SQLite", "SQLiteCommand", False, "SQLiteCommand", "(System.String,System.Data.SQLite.SQLiteConnection)", "", "Argument[0]", "sql", "manual"]
@@ -12,7 +12,7 @@ extensions:
      - ["System.Data.SQLite", "SQLiteDataAdapter", False, "SQLiteDataAdapter", "(System.String,System.String,System.Boolean)", "", "Argument[0]", "sql", "manual"]
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Data.SQLite", "SQLiteCommand", False, "SQLiteCommand", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
      - ["System.Data.SQLite", "SQLiteCommand", False, "SQLiteCommand", "(System.String,System.Data.SQLite.SQLiteConnection)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
--- a/csharp/ql/lib/ext/System.Data.SqlClient.model.yml
+++ b/csharp/ql/lib/ext/System.Data.SqlClient.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["System.Data.SqlClient", "SqlCommand", False, "SqlCommand", "(System.String)", "", "Argument[0]", "sql", "manual"]
      - ["System.Data.SqlClient", "SqlCommand", False, "SqlCommand", "(System.String,System.Data.SqlClient.SqlConnection)", "", "Argument[0]", "sql", "manual"]
@@ -11,7 +11,7 @@ extensions:
      - ["System.Data.SqlClient", "SqlDataAdapter", False, "SqlDataAdapter", "(System.String,System.String)", "", "Argument[0]", "sql", "manual"]
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Data.SqlClient", "SqlCommand", False, "SqlCommand", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
      - ["System.Data.SqlClient", "SqlCommand", False, "SqlCommand", "(System.String,System.Data.SqlClient.SqlConnection)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
--- a/csharp/ql/lib/ext/System.Data.model.yml
+++ b/csharp/ql/lib/ext/System.Data.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Data", "ConstraintCollection", False, "Add", "(System.Data.Constraint)", "", "Argument[0]", "Argument[this].Element", "value", "manual"]
      - ["System.Data", "ConstraintCollection", False, "AddRange", "(System.Data.Constraint[])", "", "Argument[0].Element", "Argument[this].Element", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Diagnostics.model.yml
+++ b/csharp/ql/lib/ext/System.Diagnostics.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Diagnostics", "ActivityTagsCollection", False, "ActivityTagsCollection", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair<,>.Key]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair<,>.Key]", "value", "manual"]
      - ["System.Diagnostics", "ActivityTagsCollection", False, "ActivityTagsCollection", "(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,System.Object>>)", "", "Argument[0].Element.Property[System.Collections.Generic.KeyValuePair<,>.Value]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair<,>.Value]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Dynamic.model.yml
+++ b/csharp/ql/lib/ext/System.Dynamic.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Dynamic", "ExpandoObject", False, "Add", "(System.Collections.Generic.KeyValuePair<System.String,System.Object>)", "", "Argument[0].Property[System.Collections.Generic.KeyValuePair<,>.Key]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair<,>.Key]", "value", "manual"]
      - ["System.Dynamic", "ExpandoObject", False, "Add", "(System.Collections.Generic.KeyValuePair<System.String,System.Object>)", "", "Argument[0].Property[System.Collections.Generic.KeyValuePair<,>.Value]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair<,>.Value]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.IO.Compression.model.yml
+++ b/csharp/ql/lib/ext/System.IO.Compression.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.IO.Compression", "DeflateStream", False, "DeflateStream", "(System.IO.Stream,System.IO.Compression.CompressionLevel)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
      - ["System.IO.Compression", "DeflateStream", False, "DeflateStream", "(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
--- a/csharp/ql/lib/ext/System.IO.model.yml
+++ b/csharp/ql/lib/ext/System.IO.model.yml
@@ -1,12 +1,12 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
      - ["System.IO", "FileStream", False, "FileStream", "", "", "Argument[this]", "file", "manual"]
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.IO", "FileStream", False, "FileStream", "(System.String,System.IO.FileMode)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
      - ["System.IO", "FileStream", False, "FileStream", "(System.String,System.IO.FileMode,System.IO.FileAccess)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
@@ -58,18 +58,18 @@ extensions:
      - ["System.IO", "Stream", False, "WriteAsync", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
      - ["System.IO", "Stream", True, "WriteAsync", "(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
      - ["System.IO", "StreamReader", False, "StreamReader", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
-      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Text.Encoding,System.Boolean,System.IO.FileStreamOptions)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
-      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Text.Encoding,System.Boolean,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StreamReader", False, "StreamReader", "(System.IO.Stream,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StreamReader", False, "StreamReader", "(System.IO.Stream,System.Text.Encoding)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StreamReader", False, "StreamReader", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
      - ["System.IO", "StreamReader", False, "StreamReader", "(System.IO.Stream,System.Text.Encoding,System.Boolean,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
      - ["System.IO", "StreamReader", False, "StreamReader", "(System.IO.Stream,System.Text.Encoding,System.Boolean,System.Int32,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
-      - ["System.IO", "StreamReader", False, "StreamReader", "(System.IO.Stream,System.Text.Encoding,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
-      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Text.Encoding,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
-      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.IO.FileStreamOptions)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
-      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
-      - ["System.IO", "StreamReader", False, "StreamReader", "(System.IO.Stream,System.Text.Encoding)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
-      - ["System.IO", "StreamReader", False, "StreamReader", "(System.IO.Stream,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.IO.FileStreamOptions)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Text.Encoding)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Text.Encoding,System.Boolean)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Text.Encoding,System.Boolean,System.IO.FileStreamOptions)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Text.Encoding,System.Boolean,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
      - ["System.IO", "StringReader", False, "StringReader", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
      - ["System.IO", "TextReader", True, "Read", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
      - ["System.IO", "TextReader", True, "Read", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
--- a/csharp/ql/lib/ext/System.Linq.model.yml
+++ b/csharp/ql/lib/ext/System.Linq.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Linq", "Enumerable", False, "Aggregate<,,>", "(System.Collections.Generic.IEnumerable<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[0].Element", "Argument[2].Parameter[1]", "value", "manual"]
      - ["System.Linq", "Enumerable", False, "Aggregate<,,>", "(System.Collections.Generic.IEnumerable<TSource>,TAccumulate,System.Func<TAccumulate,TSource,TAccumulate>,System.Func<TAccumulate,TResult>)", "", "Argument[1]", "Argument[2].Parameter[0]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Net.Http.Headers.model.yml
+++ b/csharp/ql/lib/ext/System.Net.Http.Headers.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Net.Http.Headers", "HttpHeaders", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Net.Http.model.yml
+++ b/csharp/ql/lib/ext/System.Net.Http.model.yml
@@ -1,12 +1,12 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["System.Net.Http", "StringContent", False, "StringContent", "", "", "Argument[0]", "xss", "manual"]
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Net.Http", "HttpRequestOptions", False, "Add", "(System.Collections.Generic.KeyValuePair<System.String,System.Object>)", "", "Argument[0].Property[System.Collections.Generic.KeyValuePair<,>.Key]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair<,>.Key]", "value", "manual"]
      - ["System.Net.Http", "HttpRequestOptions", False, "Add", "(System.Collections.Generic.KeyValuePair<System.String,System.Object>)", "", "Argument[0].Property[System.Collections.Generic.KeyValuePair<,>.Value]", "Argument[this].Element.Property[System.Collections.Generic.KeyValuePair<,>.Value]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Net.Mail.model.yml
+++ b/csharp/ql/lib/ext/System.Net.Mail.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Net.Mail", "MailAddressCollection", False, "Add", "(System.String)", "", "Argument[0]", "Argument[this].Element", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Net.Sockets.model.yml
+++ b/csharp/ql/lib/ext/System.Net.Sockets.model.yml
@@ -0,0 +1,9 @@
+extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: sourceModel
+    data:
+      - ["System.Net.Sockets", "TcpClient", False, "GetStream", "", "", "ReturnValue", "remote", "manual"]
+      - ["System.Net.Sockets", "UpdClient", False, "EndReceive", "", "", "ReturnValue", "remote", "manual"]
+      - ["System.Net.Sockets", "UpdClient", False, "Receive", "", "", "ReturnValue", "remote", "manual"]
+      - ["System.Net.Sockets", "UpdClient", False, "ReceiveAsync", "", "", "ReturnValue", "remote", "manual"]
--- a/csharp/ql/lib/ext/System.Net.model.yml
+++ b/csharp/ql/lib/ext/System.Net.model.yml
@@ -1,15 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSourceModel
-    data:
-      - ["System.Net.Sockets", "TcpClient", False, "GetStream",    "", "", "ReturnValue", "remote", "manual"]
-      - ["System.Net.Sockets", "UpdClient", False, "EndReceive",   "", "", "ReturnValue", "remote", "manual"]
-      - ["System.Net.Sockets", "UpdClient", False, "Receive",      "", "", "ReturnValue", "remote", "manual"]
-      - ["System.Net.Sockets", "UpdClient", False, "ReceiveAsync", "", "", "ReturnValue", "remote", "manual"]
-  - addsTo:
-      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Net", "Cookie", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
      - ["System.Net", "CookieCollection", False, "Add", "(System.Net.CookieCollection)", "", "Argument[0]", "Argument[this].Element", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Runtime.CompilerServices.model.yml
+++ b/csharp/ql/lib/ext/System.Runtime.CompilerServices.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Runtime.CompilerServices", "ConditionalWeakTable<,>", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
      - ["System.Runtime.CompilerServices", "ConfiguredTaskAwaitable<>", False, "GetAwaiter", "()", "", "Argument[this].SyntheticField[m_configuredTaskAwaiter]", "ReturnValue", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Security.Cryptography.X509Certificates.model.yml
+++ b/csharp/ql/lib/ext/System.Security.Cryptography.X509Certificates.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "Add", "(System.Security.Cryptography.X509Certificates.X509Certificate2)", "", "Argument[0]", "Argument[this].Element", "value", "manual"]
      - ["System.Security.Cryptography.X509Certificates", "X509Certificate2Collection", False, "AddRange", "(System.Security.Cryptography.X509Certificates.X509Certificate2Collection)", "", "Argument[0].Element", "Argument[this].Element", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Security.Cryptography.model.yml
+++ b/csharp/ql/lib/ext/System.Security.Cryptography.model.yml
@@ -1,14 +1,14 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "CreateDecryptor", "(System.Byte[],System.Byte[])", "", "Argument[0]", "encryption-decryptor", "manual"]
      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "CreateEncryptor", "(System.Byte[],System.Byte[])", "", "Argument[0]", "encryption-encryptor", "manual"]
      - ["System.Security.Cryptography", "SymmetricAlgorithm", True, "set_Key", "(System.Byte[])", "", "Argument[0]", "encryption-keyprop", "manual"]
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Security.Cryptography", "AsnEncodedDataCollection", False, "Add", "(System.Security.Cryptography.AsnEncodedData)", "", "Argument[0]", "Argument[this].Element", "value", "manual"]
      - ["System.Security.Cryptography", "AsnEncodedDataCollection", False, "CopyTo", "(System.Security.Cryptography.AsnEncodedData[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Security.Permissions.model.yml
+++ b/csharp/ql/lib/ext/System.Security.Permissions.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Security.Permissions", "KeyContainerPermissionAccessEntryCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Security.Policy.model.yml
+++ b/csharp/ql/lib/ext/System.Security.Policy.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Security.Policy", "ApplicationTrustCollection", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
      - ["System.Security.Policy", "Evidence", False, "Clear", "()", "", "Argument[this].WithoutElement", "Argument[this]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Text.RegularExpressions.model.yml
+++ b/csharp/ql/lib/ext/System.Text.RegularExpressions.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Text.RegularExpressions", "CaptureCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
      - ["System.Text.RegularExpressions", "GroupCollection", False, "get_Item", "(System.Int32)", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Text.model.yml
+++ b/csharp/ql/lib/ext/System.Text.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Text", "Encoding", True, "GetBytes", "(System.Char*,System.Int32,System.Byte*,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
      - ["System.Text", "Encoding", True, "GetBytes", "(System.Char[])", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
--- a/csharp/ql/lib/ext/System.Threading.Tasks.model.yml
+++ b/csharp/ql/lib/ext/System.Threading.Tasks.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Threading.Tasks", "Task", False, "ContinueWith", "(System.Action<System.Threading.Tasks.Task,System.Object>,System.Object)", "", "Argument[1]", "Argument[0].Parameter[1]", "value", "manual"]
      - ["System.Threading.Tasks", "Task", False, "ContinueWith", "(System.Action<System.Threading.Tasks.Task,System.Object>,System.Object,System.Threading.CancellationToken)", "", "Argument[1]", "Argument[0].Parameter[1]", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Web.UI.WebControls.model.yml
+++ b/csharp/ql/lib/ext/System.Web.UI.WebControls.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Web.UI.WebControls", "TextBox", False, "get_Text", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
--- a/csharp/ql/lib/ext/System.Web.model.yml
+++ b/csharp/ql/lib/ext/System.Web.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["System.Web", "HttpResponse", False, "BinaryWrite", "", "", "Argument[0]", "html", "manual"]
      - ["System.Web", "HttpResponse", False, "TransmitFile", "", "", "Argument[0]", "html", "manual"]
@@ -9,7 +9,7 @@ extensions:
      - ["System.Web", "HttpResponse", False, "WriteFile", "", "", "Argument[0]", "html", "manual"]
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Web", "HttpCookie", False, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
      - ["System.Web", "HttpCookie", False, "get_Values", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
--- a/csharp/ql/lib/ext/System.Xml.Schema.model.yml
+++ b/csharp/ql/lib/ext/System.Xml.Schema.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Xml.Schema", "XmlSchemaCollection", False, "Add", "(System.Xml.Schema.XmlSchema)", "", "Argument[0]", "Argument[this].Element", "value", "manual"]
      - ["System.Xml.Schema", "XmlSchemaCollection", False, "Add", "(System.Xml.Schema.XmlSchemaCollection)", "", "Argument[0]", "Argument[this].Element", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Xml.Serialization.model.yml
+++ b/csharp/ql/lib/ext/System.Xml.Serialization.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Xml.Serialization", "XmlAnyElementAttributes", False, "Add", "(System.Xml.Serialization.XmlAnyElementAttribute)", "", "Argument[0]", "Argument[this].Element", "value", "manual"]
      - ["System.Xml.Serialization", "XmlAnyElementAttributes", False, "CopyTo", "(System.Xml.Serialization.XmlAnyElementAttribute[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "manual"]
--- a/csharp/ql/lib/ext/System.Xml.model.yml
+++ b/csharp/ql/lib/ext/System.Xml.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System.Xml", "XmlAttributeCollection", False, "CopyTo", "(System.Xml.XmlAttribute[],System.Int32)", "", "Argument[this].Element", "Argument[0].Element", "value", "manual"]
      - ["System.Xml", "XmlDocument", False, "Load", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
--- a/csharp/ql/lib/ext/System.model.yml
+++ b/csharp/ql/lib/ext/System.model.yml
@@ -1,14 +1,14 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
      - ["System", "Console", False, "Read", "", "", "ReturnValue", "local", "manual"]
      - ["System", "Console", False, "ReadKey", "", "", "ReturnValue", "local", "manual"]
      - ["System", "Console", False, "ReadLine", "", "", "ReturnValue", "local", "manual"]
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["System", "Array", False, "AsReadOnly<>", "(T[])", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"]
      - ["System", "Array", False, "Clear", "(System.Array)", "", "Argument[0].WithoutElement", "Argument[0]", "value", "manual"]
--- a/csharp/ql/lib/ext/Windows.Security.Cryptography.Core.model.yml
+++ b/csharp/ql/lib/ext/Windows.Security.Cryptography.Core.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["Windows.Security.Cryptography.Core", "SymmetricKeyAlgorithmProvider", False, "CreateSymmetricKey", "(Windows.Storage.Streams.IBuffer)", "", "Argument[0]", "encryption-symmetrickey", "manual"]
--- a/csharp/ql/lib/ext/generated/dotnet_runtime.model.yml
+++ b/csharp/ql/lib/ext/generated/dotnet_runtime.model.yml
@@ -5,7 +5,7 @@ extensions:

  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["System.Data.Odbc", "OdbcDataAdapter", false, "OdbcDataAdapter", "(System.String,System.Data.Odbc.OdbcConnection)", "", "Argument[0]", "sql", "generated"]
      - ["System.Data.Odbc", "OdbcDataAdapter", false, "OdbcDataAdapter", "(System.String,System.String)", "", "Argument[0]", "sql", "generated"]
@@ -39,7 +39,7 @@ extensions:

  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+CaseInsensitiveDictionaryConverter", false, "Read", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "taint", "generated"]
      - ["JsonToItemsTaskFactory", "JsonToItemsTaskFactory+JsonModelItemConverter", false, "Read", "(System.Text.Json.Utf8JsonReader,System.Type,System.Text.Json.JsonSerializerOptions)", "", "Argument[0]", "ReturnValue", "taint", "generated"]
@@ -10195,7 +10195,7 @@ extensions:

  - addsTo:
      pack: codeql/csharp-all
-      extensible: extNeutralModel
+      extensible: neutralModel
    data:
      - ["AssemblyStripper", "AssemblyStripper", "StripAssembly", "(System.String,System.String)", "generated"]
      - ["Generators", "EventSourceGenerator", "Execute", "(Microsoft.CodeAnalysis.GeneratorExecutionContext)", "generated"]
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlow.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlow.qll
@@ -82,6 +82,7 @@
 */

 import csharp
+private import ExternalFlowExtensions as Extensions
 private import internal.AccessPathSyntax
 private import internal.DataFlowDispatch
 private import internal.DataFlowPrivate
@@ -138,14 +139,6 @@ private predicate summaryModelInternal(string row) { any(SummaryModelCsvInternal

 private predicate sinkModelInternal(string row) { any(SinkModelCsvInternal s).row(row) }

-/**
- * Holds if a source model exists for the given parameters.
- */
-extensible predicate extSourceModel(
-  string namespace, string type, boolean subtypes, string name, string signature, string ext,
-  string output, string kind, string provenance
-);
-
 /** Holds if a source model exists for the given parameters. */
 predicate sourceModel(
  string namespace, string type, boolean subtypes, string name, string signature, string ext,
@@ -165,15 +158,9 @@ predicate sourceModel(
    row.splitAt(";", 8) = provenance
  )
  or
-  extSourceModel(namespace, type, subtypes, name, signature, ext, output, kind, provenance)
+  Extensions::sourceModel(namespace, type, subtypes, name, signature, ext, output, kind, provenance)
 }

-/** Holds if a sink model exists for the given parameters. */
-extensible predicate extSinkModel(
-  string namespace, string type, boolean subtypes, string name, string signature, string ext,
-  string input, string kind, string provenance
-);
-
 /** Holds if a sink model exists for the given parameters. */
 predicate sinkModel(
  string namespace, string type, boolean subtypes, string name, string signature, string ext,
@@ -193,15 +180,9 @@ predicate sinkModel(
    row.splitAt(";", 8) = provenance
  )
  or
-  extSinkModel(namespace, type, subtypes, name, signature, ext, input, kind, provenance)
+  Extensions::sinkModel(namespace, type, subtypes, name, signature, ext, input, kind, provenance)
 }

-/** Holds if a summary model exists for the given parameters. */
-extensible predicate extSummaryModel(
-  string namespace, string type, boolean subtypes, string name, string signature, string ext,
-  string input, string output, string kind, string provenance
-);
-
 /** Holds if a summary model exists for the given parameters. */
 predicate summaryModel(
  string namespace, string type, boolean subtypes, string name, string signature, string ext,
@@ -222,20 +203,12 @@ predicate summaryModel(
    row.splitAt(";", 9) = provenance
  )
  or
-  extSummaryModel(namespace, type, subtypes, name, signature, ext, input, output, kind, provenance)
+  Extensions::summaryModel(namespace, type, subtypes, name, signature, ext, input, output, kind,
+    provenance)
 }

 /** Holds if a model exists indicating there is no flow for the given parameters. */
-extensible predicate extNeutralModel(
-  string namespace, string type, string name, string signature, string provenance
-);
-
-/** Holds if a model exists indicating there is no flow for the given parameters. */
-predicate neutralModel(
-  string namespace, string type, string name, string signature, string provenance
-) {
-  extNeutralModel(namespace, type, name, signature, provenance)
-}
+predicate neutralModel = Extensions::neutralModel/5;

 private predicate relevantNamespace(string namespace) {
  sourceModel(namespace, _, _, _, _, _, _, _, _) or
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlowExtensions.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlowExtensions.qll
@@ -0,0 +1,34 @@
+/**
+ * This module provides extensible predicates for defining MaD models.
+ */
+
+/**
+ * Holds if a source model exists for the given parameters.
+ */
+extensible predicate sourceModel(
+  string namespace, string type, boolean subtypes, string name, string signature, string ext,
+  string output, string kind, string provenance
+);
+
+/**
+ * Holds if a sink model exists for the given parameters.
+ */
+extensible predicate sinkModel(
+  string namespace, string type, boolean subtypes, string name, string signature, string ext,
+  string input, string kind, string provenance
+);
+
+/**
+ * Holds if a summary model exists for the given parameters.
+ */
+extensible predicate summaryModel(
+  string namespace, string type, boolean subtypes, string name, string signature, string ext,
+  string input, string output, string kind, string provenance
+);
+
+/**
+ * Holds if a model exists indicating there is no flow for the given parameters.
+ */
+extensible predicate neutralModel(
+  string namespace, string type, string name, string signature, string provenance
+);
--- a/csharp/ql/src/change-notes/2022-12-15-rename-mad-extensibles.md
+++ b/csharp/ql/src/change-notes/2022-12-15-rename-mad-extensibles.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The extensible predicates for Models as Data have been renamed (the `ext` prefix has been removed). As an example `extSummaryModel` has been renamed to `summaryModel`.
--- a/csharp/ql/test/library-tests/dataflow/external-models/ext/test.model.yml
+++ b/csharp/ql/test/library-tests/dataflow/external-models/ext/test.model.yml
@@ -2,7 +2,7 @@ extensions:

  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
    # "namespace", "type", "overrides", "name", "signature", "ext", "spec", "kind", "provenance",
      - ["My.Qltest", "A", false, "Src1", "()", "", "ReturnValue", "local", "manual"]
@@ -22,7 +22,7 @@ extensions:

  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
    # "namespace", "type", "overrides", "name", "signature", "ext", "spec", "kind", "provenance"
      - ["My.Qltest", "B", false, "Sink1", "(System.Object)", "", "Argument[0]", "code", "manual"]
@@ -34,7 +34,7 @@ extensions:
  # Summaries relevant for the ExternalFlow testcase.
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
    # "namespace", "type", "overrides", "name", "signature", "ext", "inputspec", "outputspec", "kind", "provenance"
      - ["My.Qltest", "D", false, "StepArgRes", "(System.Object)","", "Argument[0]", "ReturnValue", "taint", "manual"]
@@ -66,7 +66,7 @@ extensions:
  # Summaries relevant for the Steps testcase.
  - addsTo:
      pack: codeql/csharp-all
-      extensible: extSummaryModel
+      extensible: summaryModel
      # "namespace", "type", "overrides", "name", "signature", "ext", "inputspec", "outputspec", "kind", "provenance"
    data:
      - ["My.Qltest", "C", false, "StepArgRes", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
--- a/java/ql/integration-tests/all-platforms/kotlin/annotation-id-consistency/ext/test.model.yml
+++ b/java/ql/integration-tests/all-platforms/kotlin/annotation-id-consistency/ext/test.model.yml
@@ -1,5 +1,5 @@
 extensions:
  - addsTo:
      pack: integrationtest-annotation-id-consistency
-      extensible: extNegativeSummaryModel
+      extensible: neutralModel
    data: []
--- a/java/ql/integration-tests/all-platforms/kotlin/default-parameter-mad-flow/ext/test.model.yml
+++ b/java/ql/integration-tests/all-platforms/kotlin/default-parameter-mad-flow/ext/test.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: integrationtest-default-parameter-mad-flow
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["", "ConstructorWithDefaults", True, "ConstructorWithDefaults", "(int,int)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
      - ["", "LibKt", True, "topLevelWithDefaults", "(int,int)", "", "Argument[0]", "ReturnValue", "value", "manual"]
@@ -12,14 +12,14 @@ extensions:
      - ["", "LibClass", True, "multiParameterExtensionTest", "(int,int,int,int)", "", "Argument[0, 1]", "ReturnValue", "value", "manual"]
  - addsTo:
      pack: integrationtest-default-parameter-mad-flow
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
      - ["", "LibKt", True, "topLevelArgSource", "(SomeToken,int)", "", "Argument[0]", "kotlinMadFlowTest", "manual"]
      - ["", "LibKt", True, "extensionArgSource", "(String,SomeToken,int)", "", "Argument[1]", "kotlinMadFlowTest", "manual"]
      - ["", "SourceClass", True, "memberArgSource", "(SomeToken,int)", "", "Argument[0]", "kotlinMadFlowTest", "manual"]
  - addsTo:
      pack: integrationtest-default-parameter-mad-flow
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["", "SinkClass", True, "SinkClass", "(int,int)", "", "Argument[0]", "kotlinMadFlowTest", "manual"]
      - ["", "LibKt", True, "topLevelSink", "(int,int)", "", "Argument[0]", "kotlinMadFlowTest", "manual"]
--- a/java/ql/lib/ext/android.app.model.yml
+++ b/java/ql/lib/ext/android.app.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["android.app", "Activity", True, "bindService", "", "", "Argument[0]", "intent-start", "manual"]
      - ["android.app", "Activity", True, "bindServiceAsUser", "", "", "Argument[0]", "intent-start", "manual"]
@@ -40,7 +40,7 @@ extensions:
      - ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,OnFinished,Handler,String,Bundle)", "", "Argument[2]", "pending-intent-sent", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["android.app", "Notification$Action", True, "Action", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[-1]", "taint", "manual"]
      - ["android.app", "Notification$Action", True, "getExtras", "", "", "Argument[-1].SyntheticField[android.content.Intent.extras]", "ReturnValue", "value", "manual"]
--- a/java/ql/lib/ext/android.content.model.yml
+++ b/java/ql/lib/ext/android.content.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
      # ContentInterface models are here for backwards compatibility (it was removed in API 28)
      - ["android.content", "ContentInterface", True, "call", "(String,String,String,Bundle)", "", "Parameter[0..3]", "contentprovider", "manual"]
@@ -37,7 +37,7 @@ extensions:
      - ["android.content", "Context", True, "getExternalFilesDirs", "(String)", "", "ReturnValue", "android-external-storage-dir", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["android.content", "ContentProvider", True, "delete", "(Uri,String,String[])", "", "Argument[1]", "sql", "manual"]
      - ["android.content", "ContentProvider", True, "query", "(Uri,String[],String,String[],String)", "", "Argument[2]", "sql", "manual"]
@@ -65,7 +65,7 @@ extensions:
      - ["android.content", "Context", True, "startServiceAsUser", "", "", "Argument[0]", "intent-start", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["android.content", "ComponentName", False, "ComponentName", "(Context,Class)", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
      - ["android.content", "ComponentName", False, "ComponentName", "(Context,String)", "", "Argument[1]", "Argument[-1]", "taint", "manual"]
--- a/java/ql/lib/ext/android.database.model.yml
+++ b/java/ql/lib/ext/android.database.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["android.database", "DatabaseUtils", False, "blobFileDescriptorForQuery", "(SQLiteDatabase,String,String[])", "", "Argument[1]", "sql", "manual"]
      - ["android.database", "DatabaseUtils", False, "createDbFromSqlStatements", "(Context,String,int,String)", "", "Argument[3]", "sql", "manual"]
@@ -12,7 +12,7 @@ extensions:
      - ["android.database", "DatabaseUtils", False, "stringForQuery", "(SQLiteDatabase,String,String[])", "", "Argument[1]", "sql", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["android.database", "Cursor", True, "copyStringToBuffer", "", "", "Argument[-1]", "Argument[1]", "taint", "manual"]
      - ["android.database", "Cursor", True, "getBlob", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
--- a/java/ql/lib/ext/android.database.sqlite.model.yml
+++ b/java/ql/lib/ext/android.database.sqlite.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["android.database.sqlite", "SQLiteDatabase", False, "compileStatement", "(String)", "", "Argument[0]", "sql", "manual"]
      - ["android.database.sqlite", "SQLiteDatabase", False, "delete", "(String,String,String[])", "", "Argument[0..1]", "sql", "manual"]
@@ -57,7 +57,7 @@ extensions:
      - ["android.database.sqlite", "SQLiteQueryBuilder", True, "update", "(SQLiteDatabase,ContentValues,String,String[])", "", "Argument[2]", "sql", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["android.database.sqlite", "SQLiteQueryBuilder", True, "appendColumns", "(StringBuilder,String[])", "", "Argument[1].ArrayElement", "Argument[0]", "taint", "manual"]
      - ["android.database.sqlite", "SQLiteQueryBuilder", True, "appendWhere", "(CharSequence)", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
--- a/java/ql/lib/ext/android.net.model.yml
+++ b/java/ql/lib/ext/android.net.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["android.net", "Uri", True, "buildUpon", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
      - ["android.net", "Uri", False, "decode", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
--- a/java/ql/lib/ext/android.os.model.yml
+++ b/java/ql/lib/ext/android.os.model.yml
@@ -1,13 +1,13 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
      - ["android.os", "Environment", False, "getExternalStorageDirectory", "()", "", "ReturnValue", "android-external-storage-dir", "manual"]
      - ["android.os", "Environment", False, "getExternalStoragePublicDirectory", "(String)", "", "ReturnValue", "android-external-storage-dir", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["android.os", "BaseBundle", True, "get", "(String)", "", "Argument[-1].MapValue", "ReturnValue", "value", "manual"]
      - ["android.os", "BaseBundle", True, "getString", "(String)", "", "Argument[-1].MapValue", "ReturnValue", "value", "manual"]
--- a/java/ql/lib/ext/android.support.v4.app.model.yml
+++ b/java/ql/lib/ext/android.support.v4.app.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["android.support.v4.app", "FragmentTransaction", True, "add", "(Class,Bundle,String)", "", "Argument[0]", "fragment-injection", "manual"]
      - ["android.support.v4.app", "FragmentTransaction", True, "add", "(Fragment,String)", "", "Argument[0]", "fragment-injection", "manual"]
--- a/java/ql/lib/ext/android.util.model.yml
+++ b/java/ql/lib/ext/android.util.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
      - ["android.util", "AttributeSet", False, "getAttributeBooleanValue", "", "", "ReturnValue", "remote", "manual"]
      - ["android.util", "AttributeSet", False, "getAttributeCount", "", "", "ReturnValue", "remote", "manual"]
@@ -21,7 +21,7 @@ extensions:
      - ["android.util", "AttributeSet", False, "getStyleAttribute", "", "", "ReturnValue", "remote", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["android.util", "Log", True, "d", "", "", "Argument[1]", "logging", "manual"]
      - ["android.util", "Log", True, "e", "", "", "Argument[1]", "logging", "manual"]
--- a/java/ql/lib/ext/android.webkit.model.yml
+++ b/java/ql/lib/ext/android.webkit.model.yml
@@ -1,13 +1,13 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
      - ["android.webkit", "WebView", False, "getOriginalUrl", "()", "", "ReturnValue", "remote", "manual"]
      - ["android.webkit", "WebView", False, "getUrl", "()", "", "ReturnValue", "remote", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      # Models representing methods susceptible to XSS attacks.
      - ["android.webkit", "WebView", False, "evaluateJavascript", "", "", "Argument[0]", "xss", "manual"]
--- a/java/ql/lib/ext/android.widget.model.yml
+++ b/java/ql/lib/ext/android.widget.model.yml
@@ -1,11 +1,11 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
      - ["android.widget", "EditText", True, "getText", "", "", "ReturnValue", "android-widget", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["android.widget", "EditText", True, "getText", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
--- a/java/ql/lib/ext/androidx.core.app.model.yml
+++ b/java/ql/lib/ext/androidx.core.app.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["androidx.core.app", "AlarmManagerCompat", True, "setAlarmClock", "", "", "Argument[2..3]", "pending-intent-sent", "manual"]
      - ["androidx.core.app", "AlarmManagerCompat", True, "setAndAllowWhileIdle", "", "", "Argument[3]", "pending-intent-sent", "manual"]
@@ -11,7 +11,7 @@ extensions:
      - ["androidx.core.app", "NotificationManagerCompat", True, "notify", "(int,Notification)", "", "Argument[1]", "pending-intent-sent", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["androidx.core.app", "NotificationCompat$Action", True, "Action", "(IconCompat,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[-1]", "taint", "manual"]
      - ["androidx.core.app", "NotificationCompat$Action", True, "Action", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[-1]", "taint", "manual"]
--- a/java/ql/lib/ext/androidx.fragment.app.model.yml
+++ b/java/ql/lib/ext/androidx.fragment.app.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["androidx.fragment.app", "FragmentTransaction", True, "add", "(Class,Bundle,String)", "", "Argument[0]", "fragment-injection", "manual"]
      - ["androidx.fragment.app", "FragmentTransaction", True, "add", "(Fragment,String)", "", "Argument[0]", "fragment-injection", "manual"]
--- a/java/ql/lib/ext/androidx.slice.builders.model.yml
+++ b/java/ql/lib/ext/androidx.slice.builders.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["androidx.slice.builders", "ListBuilder", True, "addAction", "", "", "Argument[-1]", "ReturnValue", "value", "manual"]
      - ["androidx.slice.builders", "ListBuilder", True, "addAction", "", "", "Argument[0].SyntheticField[androidx.slice.Slice.action]", "Argument[-1].SyntheticField[androidx.slice.Slice.action]", "taint", "manual"]
--- a/java/ql/lib/ext/androidx.slice.model.yml
+++ b/java/ql/lib/ext/androidx.slice.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
      - ["androidx.slice", "SliceProvider", True, "onBindSlice", "", "", "Parameter[0]", "contentprovider", "manual"]
      - ["androidx.slice", "SliceProvider", True, "onCreatePermissionRequest", "", "", "Parameter[0]", "contentprovider", "manual"]
@@ -10,7 +10,7 @@ extensions:
      - ["androidx.slice", "SliceProvider", True, "onSliceUnpinned", "", "", "Parameter[0]", "contentprovider", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["androidx.slice", "SliceProvider", True, "onBindSlice", "", "", "ReturnValue", "pending-intent-sent", "manual"]
      - ["androidx.slice", "SliceProvider", True, "onCreatePermissionRequest", "", "", "ReturnValue", "pending-intent-sent", "manual"]
--- a/java/ql/lib/ext/cn.hutool.core.codec.model.yml
+++ b/java/ql/lib/ext/cn.hutool.core.codec.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["cn.hutool.core.codec", "Base64", True, "decode", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
--- a/java/ql/lib/ext/com.esotericsoftware.kryo.io.model.yml
+++ b/java/ql/lib/ext/com.esotericsoftware.kryo.io.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["com.esotericsoftware.kryo.io", "Input", False, "Input", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
--- a/java/ql/lib/ext/com.esotericsoftware.kryo5.io.model.yml
+++ b/java/ql/lib/ext/com.esotericsoftware.kryo5.io.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["com.esotericsoftware.kryo5.io", "Input", False, "Input", "", "", "Argument[0]", "Argument[-1]", "taint", "manual"]
--- a/java/ql/lib/ext/com.fasterxml.jackson.core.model.yml
+++ b/java/ql/lib/ext/com.fasterxml.jackson.core.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["com.fasterxml.jackson.core", "JsonFactory", False, "createParser", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
--- a/java/ql/lib/ext/com.fasterxml.jackson.databind.model.yml
+++ b/java/ql/lib/ext/com.fasterxml.jackson.databind.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["com.fasterxml.jackson.databind", "ObjectMapper", True, "convertValue", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
      - ["com.fasterxml.jackson.databind", "ObjectMapper", False, "createParser", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
--- a/java/ql/lib/ext/com.google.common.base.model.yml
+++ b/java/ql/lib/ext/com.google.common.base.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["com.google.common.base", "Splitter", False, "onPattern", "(String)", "", "Argument[0]", "regex-use[]", "manual"]
      - ["com.google.common.base", "Splitter", False, "split", "(CharSequence)", "", "Argument[-1]", "regex-use[0]", "manual"]
@@ -9,7 +9,7 @@ extensions:
      - ["com.google.common.base", "Splitter$MapSplitter", False, "split", "(CharSequence)", "", "Argument[-1]", "regex-use[0]", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["com.google.common.base", "Ascii", False, "toLowerCase", "(CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
      - ["com.google.common.base", "Ascii", False, "toLowerCase", "(String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
--- a/java/ql/lib/ext/com.google.common.cache.model.yml
+++ b/java/ql/lib/ext/com.google.common.cache.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["com.google.common.cache", "Cache", True, "asMap", "()", "", "Argument[-1].MapKey", "ReturnValue.MapKey", "value", "manual"]
      - ["com.google.common.cache", "Cache", True, "asMap", "()", "", "Argument[-1].MapValue", "ReturnValue.MapValue", "value", "manual"]
--- a/java/ql/lib/ext/com.google.common.collect.model.yml
+++ b/java/ql/lib/ext/com.google.common.collect.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      # Methods depending on lambda flow are not currently modeled
      # Methods depending on stronger aliasing properties than we support are also not modeled.
--- a/java/ql/lib/ext/com.google.common.flogger.model.yml
+++ b/java/ql/lib/ext/com.google.common.flogger.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["com.google.common.flogger", "LoggingApi", True, "log", "", "", "Argument[0]", "logging", "manual"]
      - ["com.google.common.flogger", "LoggingApi", True, "log", "(String,Object)", "", "Argument[1]", "logging", "manual"]
--- a/java/ql/lib/ext/com.google.common.io.model.yml
+++ b/java/ql/lib/ext/com.google.common.io.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["com.google.common.io", "Resources", False, "asByteSource", "(URL)", "", "Argument[0]", "url-open-stream", "manual"]
      - ["com.google.common.io", "Resources", False, "asCharSource", "(URL,Charset)", "", "Argument[0]", "url-open-stream", "manual"]
@@ -11,7 +11,7 @@ extensions:
      - ["com.google.common.io", "Resources", False, "toString", "(URL,Charset)", "", "Argument[0]", "url-open-stream", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["com.google.common.io", "BaseEncoding", True, "decode", "(CharSequence)", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
      - ["com.google.common.io", "BaseEncoding", True, "decode", "(CharSequence)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
--- a/java/ql/lib/ext/com.hubspot.jinjava.model.yml
+++ b/java/ql/lib/ext/com.hubspot.jinjava.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["com.hubspot.jinjava", "Jinjava", True, "render", "", "", "Argument[0]", "ssti", "manual"]
      - ["com.hubspot.jinjava", "Jinjava", True, "renderForResult", "", "", "Argument[0]", "ssti", "manual"]
--- a/java/ql/lib/ext/com.mitchellbosecke.pebble.model.yml
+++ b/java/ql/lib/ext/com.mitchellbosecke.pebble.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["com.mitchellbosecke.pebble", "PebbleEngine", True, "getLiteralTemplate", "", "", "Argument[0]", "ssti", "manual"]
      - ["com.mitchellbosecke.pebble", "PebbleEngine", True, "getTemplate", "", "", "Argument[0]", "ssti", "manual"]
--- a/java/ql/lib/ext/com.opensymphony.xwork2.ognl.model.yml
+++ b/java/ql/lib/ext/com.opensymphony.xwork2.ognl.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["com.opensymphony.xwork2.ognl", "OgnlUtil", False, "callMethod", "", "", "Argument[0]", "ognl-injection", "manual"]
      - ["com.opensymphony.xwork2.ognl", "OgnlUtil", False, "getValue", "", "", "Argument[0]", "ognl-injection", "manual"]
--- a/java/ql/lib/ext/com.rabbitmq.client.impl.model.yml
+++ b/java/ql/lib/ext/com.rabbitmq.client.impl.model.yml
@@ -1,14 +1,14 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
      - ["com.rabbitmq.client.impl", "Frame", True, "getInputStream", "()", "", "ReturnValue", "remote", "manual"]
      - ["com.rabbitmq.client.impl", "Frame", True, "getPayload", "()", "", "ReturnValue", "remote", "manual"]
      - ["com.rabbitmq.client.impl", "FrameHandler", True, "readFrame", "()", "", "ReturnValue", "remote", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["com.rabbitmq.client.impl", "Frame", False, "fromBodyFragment", "(int,byte[],int,int)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
      - ["com.rabbitmq.client.impl", "Frame", False, "readFrom", "(DataInputStream)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
--- a/java/ql/lib/ext/com.rabbitmq.client.model.yml
+++ b/java/ql/lib/ext/com.rabbitmq.client.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data:
      - ["com.rabbitmq.client", "Command", True, "getContentBody", "()", "", "ReturnValue", "remote", "manual"]
      - ["com.rabbitmq.client", "Command", True, "getContentHeader", "()", "", "ReturnValue", "remote", "manual"]
@@ -23,7 +23,7 @@ extensions:
      - ["com.rabbitmq.client", "StringRpcServer", True, "handleStringCall", "", "", "Parameter[0]", "remote", "manual"]
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data:
      - ["com.rabbitmq.client", "GetResponse", True, "GetResponse", "", "", "Argument[2]", "Argument[-1]", "taint", "manual"]
      - ["com.rabbitmq.client", "GetResponse", True, "getBody", "()", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
--- a/java/ql/lib/ext/com.unboundid.ldap.sdk.model.yml
+++ b/java/ql/lib/ext/com.unboundid.ldap.sdk.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["com.unboundid.ldap.sdk", "LDAPConnection", False, "asyncSearch", "", "", "Argument[0]", "ldap", "manual"]
      - ["com.unboundid.ldap.sdk", "LDAPConnection", False, "search", "(ReadOnlySearchRequest)", "", "Argument[0]", "ldap", "manual"]
--- a/java/ql/lib/ext/com.zaxxer.hikari.model.yml
+++ b/java/ql/lib/ext/com.zaxxer.hikari.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data:
      - ["com.zaxxer.hikari", "HikariConfig", False, "HikariConfig", "(Properties)", "", "Argument[0]", "jdbc-url", "manual"]
      - ["com.zaxxer.hikari", "HikariConfig", False, "setJdbcUrl", "(String)", "", "Argument[0]", "jdbc-url", "manual"]
--- a/java/ql/lib/ext/dummy.model.yml
+++ b/java/ql/lib/ext/dummy.model.yml
@@ -2,17 +2,17 @@ extensions:
  # Make sure that the extensible model predicates are at least defined as empty.
  - addsTo:
      pack: codeql/java-all
-      extensible: extSourceModel
+      extensible: sourceModel
    data: []
  - addsTo:
      pack: codeql/java-all
-      extensible: extSinkModel
+      extensible: sinkModel
    data: []
  - addsTo:
      pack: codeql/java-all
-      extensible: extSummaryModel
+      extensible: summaryModel
    data: []
  - addsTo:
      pack: codeql/java-all
-      extensible: extNeutralModel
+      extensible: neutralModel
    data: []
--- a/java/ql/lib/ext/experimental/android.webkit.model.yml
+++ b/java/ql/lib/ext/experimental/android.webkit.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extExperimentalSummaryModel
+      extensible: experimentalSummaryModel
    data:
      - ["android.webkit", "WebResourceRequest", False, "getUrl", "", "", "Argument[-1]", "ReturnValue", "taint", "manual", "android-web-resource-response"]
--- a/java/ql/lib/ext/experimental/com.auth0.jwt.interfaces.model.yml
+++ b/java/ql/lib/ext/experimental/com.auth0.jwt.interfaces.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extExperimentalSummaryModel
+      extensible: experimentalSummaryModel
    data:
      - ["com.auth0.jwt.interfaces", "Verification", True, "acceptExpiresAt", "", "", "Argument[-1]", "ReturnValue", "value", "manual", "hardcoded-jwt-key"]
      - ["com.auth0.jwt.interfaces", "Verification", True, "acceptIssuedAt", "", "", "Argument[-1]", "ReturnValue", "value", "manual", "hardcoded-jwt-key"]
--- a/java/ql/lib/ext/experimental/com.jfinal.core.model.yml
+++ b/java/ql/lib/ext/experimental/com.jfinal.core.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extExperimentalSourceModel
+      extensible: experimentalSourceModel
    data:
      - ["com.jfinal.core", "Controller", True, "get", "", "", "ReturnValue", "remote", "manual", "file-path-injection"]
      - ["com.jfinal.core", "Controller", True, "getBoolean", "", "", "ReturnValue", "remote", "manual", "file-path-injection"]
--- a/java/ql/lib/ext/experimental/dummy.model.yml
+++ b/java/ql/lib/ext/experimental/dummy.model.yml
@@ -3,13 +3,13 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extExperimentalSourceModel
+      extensible: experimentalSourceModel
    data: []
  - addsTo:
      pack: codeql/java-all
-      extensible: extExperimentalSinkModel
+      extensible: experimentalSinkModel
    data: []
  - addsTo:
      pack: codeql/java-all
-      extensible: extExperimentalSummaryModel
+      extensible: experimentalSummaryModel
    data: []
--- a/java/ql/lib/ext/experimental/io.undertow.server.handlers.resource.model.yml
+++ b/java/ql/lib/ext/experimental/io.undertow.server.handlers.resource.model.yml
@@ -1,7 +1,7 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extExperimentalSummaryModel
+      extensible: experimentalSummaryModel
    data:
      - ["io.undertow.server.handlers.resource", "Resource", True, "getFile", "", "", "Argument[-1]", "ReturnValue", "taint", "manual", "unsafe-url-forward"]
      - ["io.undertow.server.handlers.resource", "Resource", True, "getFilePath", "", "", "Argument[-1]", "ReturnValue", "taint", "manual", "unsafe-url-forward"]
--- a/java/ql/lib/ext/experimental/jakarta.servlet.http.model.yml
+++ b/java/ql/lib/ext/experimental/jakarta.servlet.http.model.yml
@@ -1,6 +1,6 @@
 extensions:
  - addsTo:
      pack: codeql/java-all
-      extensible: extExperimentalSourceModel
+      extensible: experimentalSourceModel
    data:
      - ["jakarta.servlet.http", "HttpServletRequest", True, "getServletPath", "", "", "ReturnValue", "remote", "manual", "unsafe-url-forward"]
--- a/Show More
+++ b/Show More