diff --git a/ifrs17-template/Report/ParameterReports.ipynb b/ifrs17-template/Report/ParameterReports.ipynb
index e2702fee..79ccf72c 100644
--- a/ifrs17-template/Report/ParameterReports.ipynb
+++ b/ifrs17-template/Report/ParameterReports.ipynb
@@ -358,7 +358,7 @@
                 "await Report.ForObjects(lockedPartnerRatings)",
                 "\n            .WithQuerySource(Workspace)",
                 "\n            .GroupRowsBy(x => x.Partner)",
-                "\n            .GroupColumnsBy(x => x.PartnerRatingType).GroupColumnsBy(x => \"Initial Year: \" + x.InitialYear.ToString())",
+                "\n            .GroupColumnsBy(x => x.PartnerRatingType).GroupColumnsBy(x => \"Initial Year: \" + x.InitialYear)",
                 "\n            .ToTable()",
                 "\n            .ExecuteAsync()"
             ],
diff --git a/ifrs17/Constants/Consts.ipynb b/ifrs17/Constants/Consts.ipynb
index d4e0b6d7..5184528f 100644
--- a/ifrs17/Constants/Consts.ipynb
+++ b/ifrs17/Constants/Consts.ipynb
@@ -459,8 +459,10 @@
                 "\n    public const string YieldCurves = nameof(YieldCurves);",
                 "\n    public const string SingleDataNodeParameters = nameof(SingleDataNodeParameters);",
                 "\n    public const string InterDataNodeParameters = nameof(InterDataNodeParameters);",
-                "\n    public const string PartnerRating = nameof(PartnerRating);",
-                "\n    public const string PartnerDefaultRates = nameof(PartnerDefaultRates);",
+                "\n    public const string CurrentPartnerRating = nameof(CurrentPartnerRating);",
+                "\n    public const string CurrentPartnerDefaultRates = nameof(CurrentPartnerDefaultRates);",
+                "\n    public const string LockedInPartnerRating = nameof(LockedInPartnerRating);",
+                "\n    public const string LockedInPartnerDefaultRates = nameof(LockedInPartnerDefaultRates);",
                 "\n}"
             ],
             "metadata": {},
diff --git a/ifrs17/Report/ParameterReportMutableScopeInteractive.ipynb b/ifrs17/Report/ParameterReportMutableScopeInteractive.ipynb
index 6f252599..df9f989f 100644
--- a/ifrs17/Report/ParameterReportMutableScopeInteractive.ipynb
+++ b/ifrs17/Report/ParameterReportMutableScopeInteractive.ipynb
@@ -151,7 +151,7 @@
                 "\n                        .ExecuteAsync();",
                 "\n    }",
                 "\n",
-                "\n    async Task<GridOptions> GetPartnerRatingReport()",
+                "\n    async Task<GridOptions> GetCurrentPartnerRatingReport()",
                 "\n    {",
                 "\n        await GetStorage().InitializeAsync((Year, Month), ReportingNode, Scenario, CurrencyType);",
                 "\n        var data = await workspace.GetCurrentPartnerRatingsReportParametersAsync(GetArgs());",
@@ -163,7 +163,7 @@
                 "\n                        .ExecuteAsync();",
                 "\n    }",
                 "\n",
-                "\n    async Task<GridOptions> GetDefaultRatesReport()",
+                "\n    async Task<GridOptions> GetCurrentDefaultRatesReport()",
                 "\n    {",
                 "\n        await GetStorage().InitializeAsync((Year, Month), ReportingNode, Scenario, CurrencyType);",
                 "\n        var data = await workspace.GetCurrentCreditDefaultRatesReportParametersAsync(GetArgs());",
@@ -175,6 +175,32 @@
                 "\n                        .ExecuteAsync();",
                 "\n    }",
                 "\n",
+                "\n    async Task<GridOptions> GetLockedInPartnerRatingReport()",
+                "\n    {",
+                "\n        await GetStorage().InitializeAsync((Year, Month), ReportingNode, Scenario, CurrencyType);",
+                "\n        var data = await workspace.GetLockedInPartnerRatingsReportParametersAsync(GetArgs());",
+                "\n        return await report.ForObjects(data)",
+                "\n                        .WithQuerySource(workspace)",
+                "\n                        .GroupRowsBy(x => x.Partner)",
+                "\n                        .GroupColumnsBy(x => x.PartnerRatingType)",
+                "\n                        .GroupColumnsBy(x => \"Initial Year: \" + x.InitialYear)",
+                "\n                        .ToTable()",
+                "\n                        .ExecuteAsync();",
+                "\n    }",
+                "\n",
+                "\n    async Task<GridOptions> GetLockedInDefaultRatesReport()",
+                "\n    {",
+                "\n        await GetStorage().InitializeAsync((Year, Month), ReportingNode, Scenario, CurrencyType);",
+                "\n        var data = await workspace.GetLockedInCreditDefaultRatesReportParametersAsync(GetArgs());",
+                "\n        return await report.ForObjects(data)",
+                "\n                        .WithQuerySource(workspace)",
+                "\n                        .GroupRowsBy(x => x.CreditRiskRating)",
+                "\n                        .GroupColumnsBy(x => x.CreditDefaultRatesType)",
+                "\n                        .GroupColumnsBy(x => \"Initial Year: \" + x.InitialYear)",
+                "\n                        .ToTable()",
+                "\n                        .ExecuteAsync();",
+                "\n    }",
+                "\n",
                 "\n    async Task<GridOptions> ToReport() => ReportType switch",
                 "\n        {",
                 "\n            ParameterReportType.DataNode => await GetDataNodeReport(), ",
@@ -182,8 +208,10 @@
                 "\n            ParameterReportType.YieldCurves => await GetYieldCurvesReport(), ",
                 "\n            ParameterReportType.SingleDataNodeParameters => await GetSingleDataNodeReport(), ",
                 "\n            ParameterReportType.InterDataNodeParameters => await GetInterDataNodeParametersReport(), ",
-                "\n            ParameterReportType.PartnerRating => await GetPartnerRatingReport(), ",
-                "\n            ParameterReportType.PartnerDefaultRates => await GetDefaultRatesReport(),",
+                "\n            ParameterReportType.CurrentPartnerRating => await GetCurrentPartnerRatingReport(), ",
+                "\n            ParameterReportType.CurrentPartnerDefaultRates => await GetCurrentDefaultRatesReport(),",
+                "\n            ParameterReportType.LockedInPartnerRating => await GetLockedInPartnerRatingReport(), ",
+                "\n            ParameterReportType.LockedInPartnerDefaultRates => await GetLockedInDefaultRatesReport(),",
                 "\n            _ => null",
                 "\n        };",
                 "\n",