diff --git a/full-ifrs17-template/Files/Dimensions.csv b/full-ifrs17-template/Files/Dimensions.csv
index d0a29c98..6f61a39c 100644
--- a/full-ifrs17-template/Files/Dimensions.csv
+++ b/full-ifrs17-template/Files/Dimensions.csv
@@ -1,4 +1,4 @@
-@@PvAmountType,,,,,,,,,,,
+@@AmountType,,,,,,,,,,,
 SystemName,DisplayName,Parent,Order,PeriodType,ExternalId0,ExternalId1,,,,,
 PR,Premiums,,10,BeginningOfPeriod,PayablePR,ReceivablePR,,,,,
 CL,Claims,,20,EndOfPeriod,,,,,,,
diff --git a/full-ifrs17-template/Initialization/InitSystemorphBaseToMemory.ipynb b/full-ifrs17-template/Initialization/InitSystemorphBaseToMemory.ipynb
index c66f0472..7cd237ff 100644
--- a/full-ifrs17-template/Initialization/InitSystemorphBaseToMemory.ipynb
+++ b/full-ifrs17-template/Initialization/InitSystemorphBaseToMemory.ipynb
@@ -111,7 +111,7 @@
                 "\n    .WithType<AocType>()",
                 "\n    .WithType<PnlVariableType>()",
                 "\n    .WithType<BsVariableType>()",
-                "\n    .WithType<PvAmountType>()",
+                "\n    .WithType<AmountType>()",
                 "\n    .WithType<DeferrableAmountType>()",
                 "\n    .WithType<RiskDriver>()",
                 "\n    .WithType<EconomicBasis>()",
diff --git a/full-ifrs17-template/Initialization/InitSystemorphToDatabase.ipynb b/full-ifrs17-template/Initialization/InitSystemorphToDatabase.ipynb
index 9bb486c7..21faf6db 100644
--- a/full-ifrs17-template/Initialization/InitSystemorphToDatabase.ipynb
+++ b/full-ifrs17-template/Initialization/InitSystemorphToDatabase.ipynb
@@ -87,7 +87,7 @@
                 "\n    .WithType<PnlVariableType>()",
                 "\n    .WithType<BsVariableType>()",
                 "\n    .WithType<AocConfiguration>()",
-                "\n    .WithType<PvAmountType>()",
+                "\n    .WithType<AmountType>()",
                 "\n    .WithType<DeferrableAmountType>()",
                 "\n    .WithType<RiskDriver>()",
                 "\n    .WithType<EconomicBasis>()",
diff --git a/ifrs17/DataModel/DataStructure.ipynb b/ifrs17/DataModel/DataStructure.ipynb
index dc35c01d..c179a578 100644
--- a/ifrs17/DataModel/DataStructure.ipynb
+++ b/ifrs17/DataModel/DataStructure.ipynb
@@ -453,9 +453,7 @@
             "id": "xXvF54kBF0C6mNNLJGYH9Q",
             "cell_type": "code",
             "source": [
-                "public record PvAmountType : AmountType {} //TODO Rename ",
-                "\n",
-                "\npublic record DeferrableAmountType : AmountType {}"
+                "public record DeferrableAmountType : AmountType {}"
             ],
             "metadata": {},
             "execution_count": 0,
diff --git a/ifrs17/Import/Importers.ipynb b/ifrs17/Import/Importers.ipynb
index 53fd5640..af7d117c 100644
--- a/ifrs17/Import/Importers.ipynb
+++ b/ifrs17/Import/Importers.ipynb
@@ -72,7 +72,7 @@
                 "\n    ",
                 "\n    // Dimensions",
                 "\n    public Dictionary<string, EstimateType> EstimateType;",
-                "\n    public Dictionary<string, PvAmountType> PvAmountType; ",
+                "\n    public Dictionary<string, AmountType> AmountType; ",
                 "\n    public HashSet<AocStep> AocTypeMap;",
                 "\n    private HashSet<string> estimateTypes;",
                 "\n    private HashSet<string> amountTypes;",
@@ -145,7 +145,7 @@
                 "\n                                    : await LoadDataNodesAsync(dataSource, args);",
                 "\n        // Dimensions",
                 "\n        EstimateType = (await dataSource.Query<EstimateType>().ToArrayAsync()).ToDictionary(x => x.SystemName);",
-                "\n        PvAmountType = (await dataSource.Query<PvAmountType>().ToArrayAsync()).ToDictionary(x => x.SystemName);",
+                "\n        AmountType = (await dataSource.Query<AmountType>().Where(x =>!(x is DeferrableAmountType)).ToArrayAsync()).ToDictionary(x => x.SystemName);",
                 "\n        amountTypes = (await dataSource.Query<AmountType>().ToArrayAsync()).Select(at => at.SystemName).ToHashSet();",
                 "\n        estimateTypes = args.ImportFormat switch {",
                 "\n                ImportFormats.SimpleValue => (await dataSource.Query<EstimateType>().ToArrayAsync()).Select(et => et.SystemName).ToHashSet(),",
@@ -159,7 +159,7 @@
                 "\n        // DimensionsWithExternalId",
                 "\n        DimensionsWithExternalId = new Dictionary<Type, Dictionary<string, string>>()",
                 "\n        {",
-                "\n            { typeof(PvAmountType), await GetDimensionWithExternalIdDictionaryAsync<PvAmountType>() },",
+                "\n            { typeof(AmountType), await GetDimensionWithExternalIdDictionaryAsync<AmountType>() },",
                 "\n            { typeof(EstimateType), await GetDimensionWithExternalIdDictionaryAsync<EstimateType>() }",
                 "\n        };",
                 "\n        ",
@@ -1105,8 +1105,8 @@
                 "\n                return null; ",
                 "\n            }",
                 "\n            ",
-                "\n            var amountType = parsingStorage.DimensionsWithExternalId[typeof(PvAmountType)].TryGetValue(valueType, out var at)? at : null;",
-                "\n            var isStdActual = parsingStorage.PvAmountType.ContainsKey(valueType);",
+                "\n            var amountType = parsingStorage.DimensionsWithExternalId[typeof(AmountType)].TryGetValue(valueType, out var at)? at : null;",
+                "\n            var isStdActual = parsingStorage.AmountType.ContainsKey(valueType);",
                 "\n            var estimateType = isStdActual? EstimateTypes.A : parsingStorage.DimensionsWithExternalId[typeof(EstimateType)].TryGetValue(valueType, out var et)? et : null;",
                 "\n            if(estimateType == null || amountType == null) { ",
                 "\n                ApplicationMessage.Log(Error.ValueTypeNotValid, valueType);",