diff --git a/TSS.Py/src/TpmTypes.py b/TSS.Py/src/TpmTypes.py
index 88a71fcb..8130880d 100644
--- a/TSS.Py/src/TpmTypes.py
+++ b/TSS.Py/src/TpmTypes.py
@@ -4937,7 +4937,7 @@ def __init__(self, data = None):
     @property
     def capability(self): # TPM_CAP
         """ The capability """
-        return data.GetUnionSelector()
+        return self.data.GetUnionSelector()
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -5436,7 +5436,7 @@ def __init__(self, magic = 0, qualifiedSigner = None, extraData = None, clockInf
     @property
     def type(self): # TPM_ST
         """ Type of the attestation structure """
-        return attested.GetUnionSelector()
+        return self.attested.GetUnionSelector()
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -6368,7 +6368,7 @@ def __init__(self, details = None):
     @property
     def scheme(self): # TPM_ALG_ID
         """ Selects the scheme """
-        return details.GetUnionSelector() if details else TPM_ALG_ID.NULL
+        return self.details.GetUnionSelector() if self.details else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -6625,7 +6625,7 @@ def __init__(self, details = None):
     @property
     def scheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return details.GetUnionSelector() if details else TPM_ALG_ID.NULL
+        return self.details.GetUnionSelector() if self.details else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -6930,7 +6930,7 @@ def __init__(self, details = None):
     @property
     def scheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return details.GetUnionSelector() if details else TPM_ALG_ID.NULL
+        return self.details.GetUnionSelector() if self.details else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -7008,7 +7008,7 @@ def __init__(self, details = None):
     @property
     def scheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return details.GetUnionSelector() if details else TPM_ALG_ID.NULL
+        return self.details.GetUnionSelector() if self.details else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -7055,7 +7055,7 @@ def __init__(self, details = None):
     @property
     def scheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return details.GetUnionSelector() if details else TPM_ALG_ID.NULL
+        return self.details.GetUnionSelector() if self.details else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -7102,7 +7102,7 @@ def __init__(self, details = None):
     @property
     def scheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return details.GetUnionSelector() if details else TPM_ALG_ID.NULL
+        return self.details.GetUnionSelector() if self.details else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -7333,7 +7333,7 @@ def __init__(self, details = None):
     @property
     def scheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return details.GetUnionSelector() if details else TPM_ALG_ID.NULL
+        return self.details.GetUnionSelector() if self.details else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -7406,12 +7406,12 @@ def __init__(self, curveID = 0, keySize = 0, kdf = None, sign = None, p = None,
     @property
     def kdfScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return kdf.GetUnionSelector() if kdf else TPM_ALG_ID.NULL
+        return self.kdf.GetUnionSelector() if self.kdf else TPM_ALG_ID.NULL
 
     @property
     def signScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return sign.GetUnionSelector() if sign else TPM_ALG_ID.NULL
+        return self.sign.GetUnionSelector() if self.sign else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -7781,7 +7781,7 @@ def __init__(self, signature = None):
     @property
     def sigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return signature.GetUnionSelector() if signature else TPM_ALG_ID.NULL
+        return self.signature.GetUnionSelector() if self.signature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -7859,7 +7859,7 @@ def __init__(self, scheme = None):
     @property
     def schemeScheme(self): # TPM_ALG_ID
         """ Selects the scheme """
-        return scheme.GetUnionSelector() if scheme else TPM_ALG_ID.NULL
+        return self.scheme.GetUnionSelector() if self.scheme else TPM_ALG_ID.NULL
 
     def GetUnionSelector(self): # TPM_ALG_ID
         """ TpmUnion method """
@@ -7921,7 +7921,7 @@ def __init__(self, symmetric = None, scheme = None):
     @property
     def schemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return scheme.GetUnionSelector() if scheme else TPM_ALG_ID.NULL
+        return self.scheme.GetUnionSelector() if self.scheme else TPM_ALG_ID.NULL
 
     def GetUnionSelector(self): # TPM_ALG_ID
         """ TpmUnion method """
@@ -7996,7 +7996,7 @@ def __init__(self, symmetric = None, scheme = None, keyBits = 0, exponent = 0):
     @property
     def schemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return scheme.GetUnionSelector() if scheme else TPM_ALG_ID.NULL
+        return self.scheme.GetUnionSelector() if self.scheme else TPM_ALG_ID.NULL
 
     def GetUnionSelector(self): # TPM_ALG_ID
         """ TpmUnion method """
@@ -8076,12 +8076,12 @@ def __init__(self, symmetric = None, scheme = None, curveID = 0, kdf = None):
     @property
     def schemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return scheme.GetUnionSelector() if scheme else TPM_ALG_ID.NULL
+        return self.scheme.GetUnionSelector() if self.scheme else TPM_ALG_ID.NULL
 
     @property
     def kdfScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return kdf.GetUnionSelector() if kdf else TPM_ALG_ID.NULL
+        return self.kdf.GetUnionSelector() if self.kdf else TPM_ALG_ID.NULL
 
     def GetUnionSelector(self): # TPM_ALG_ID
         """ TpmUnion method """
@@ -8137,7 +8137,7 @@ def __init__(self, parameters = None):
     @property
     def type(self): # TPM_ALG_ID
         """ The algorithm to be tested """
-        return parameters.GetUnionSelector()
+        return self.parameters.GetUnionSelector()
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -8197,7 +8197,7 @@ def __init__(self, nameAlg = TPM_ALG_ID.NULL, objectAttributes = 0, authPolicy =
     @property
     def type(self): # TPM_ALG_ID
         """ Algorithm associated with this object """
-        return parameters.GetUnionSelector()
+        return self.parameters.GetUnionSelector()
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -8375,7 +8375,7 @@ def sensitiveType(self): # TPM_ALG_ID
         """ Identifier for the sensitive area
         This shall be the same as the type parameter of the associated public area.
         """
-        return sensitive.GetUnionSelector()
+        return self.sensitive.GetUnionSelector()
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -10632,7 +10632,7 @@ def __init__(self, keyHandle = TPM_HANDLE(), message = None, inScheme = None, la
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -10739,7 +10739,7 @@ def __init__(self, keyHandle = TPM_HANDLE(), cipherText = None, inScheme = None,
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -11170,7 +11170,7 @@ def __init__(self, keyHandle = TPM_HANDLE(), plainText = None, inScheme = None):
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -11276,7 +11276,7 @@ def __init__(self, keyHandle = TPM_HANDLE(), C1 = None, C2 = None, C3 = None, in
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -12410,7 +12410,7 @@ def __init__(self, objectHandle = TPM_HANDLE(), signHandle = TPM_HANDLE(), quali
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -12472,7 +12472,7 @@ def __init__(self, certifyInfo = None, signature = None):
     @property
     def signatureSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return signature.GetUnionSelector() if signature else TPM_ALG_ID.NULL
+        return self.signature.GetUnionSelector() if self.signature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -12540,7 +12540,7 @@ def __init__(self, signHandle = TPM_HANDLE(), objectHandle = TPM_HANDLE(), quali
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -12603,7 +12603,7 @@ def __init__(self, certifyInfo = None, signature = None):
     @property
     def signatureSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return signature.GetUnionSelector() if signature else TPM_ALG_ID.NULL
+        return self.signature.GetUnionSelector() if self.signature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -12660,7 +12660,7 @@ def __init__(self, signHandle = TPM_HANDLE(), qualifyingData = None, inScheme =
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -12718,7 +12718,7 @@ def __init__(self, quoted = None, signature = None):
     @property
     def signatureSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return signature.GetUnionSelector() if signature else TPM_ALG_ID.NULL
+        return self.signature.GetUnionSelector() if self.signature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -12781,7 +12781,7 @@ def __init__(self, privacyAdminHandle = TPM_HANDLE(), signHandle = TPM_HANDLE(),
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -12837,7 +12837,7 @@ def __init__(self, auditInfo = None, signature = None):
     @property
     def signatureSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return signature.GetUnionSelector() if signature else TPM_ALG_ID.NULL
+        return self.signature.GetUnionSelector() if self.signature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -12900,7 +12900,7 @@ def __init__(self, privacyHandle = TPM_HANDLE(), signHandle = TPM_HANDLE(), qual
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -12959,7 +12959,7 @@ def __init__(self, auditInfo = None, signature = None):
     @property
     def signatureSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return signature.GetUnionSelector() if signature else TPM_ALG_ID.NULL
+        return self.signature.GetUnionSelector() if self.signature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -13020,7 +13020,7 @@ def __init__(self, privacyAdminHandle = TPM_HANDLE(), signHandle = TPM_HANDLE(),
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -13076,7 +13076,7 @@ def __init__(self, timeInfo = None, signature = None):
     @property
     def signatureSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return signature.GetUnionSelector() if signature else TPM_ALG_ID.NULL
+        return self.signature.GetUnionSelector() if self.signature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -13144,7 +13144,7 @@ def __init__(self, objectHandle = TPM_HANDLE(), signHandle = TPM_HANDLE(), reser
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -13212,7 +13212,7 @@ def __init__(self, addedToCertificate = None, tbsDigest = None, signature = None
     @property
     def signatureSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return signature.GetUnionSelector() if signature else TPM_ALG_ID.NULL
+        return self.signature.GetUnionSelector() if self.signature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -13448,7 +13448,7 @@ def __init__(self, keyHandle = TPM_HANDLE(), digest = None, signature = None):
     @property
     def signatureSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return signature.GetUnionSelector() if signature else TPM_ALG_ID.NULL
+        return self.signature.GetUnionSelector() if self.signature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -13548,7 +13548,7 @@ def __init__(self, keyHandle = TPM_HANDLE(), digest = None, inScheme = None, val
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -13605,7 +13605,7 @@ def __init__(self, signature = None):
     @property
     def signatureSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return signature.GetUnionSelector() if signature else TPM_ALG_ID.NULL
+        return self.signature.GetUnionSelector() if self.signature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -14155,7 +14155,7 @@ def __init__(self, authObject = TPM_HANDLE(), policySession = TPM_HANDLE(), nonc
     @property
     def authSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return auth.GetUnionSelector() if auth else TPM_ALG_ID.NULL
+        return self.auth.GetUnionSelector() if self.auth else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -15876,7 +15876,7 @@ def __init__(self, authorization = TPM_HANDLE(), keyHandle = TPM_HANDLE(), fuDig
     @property
     def manifestSignatureSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return manifestSignature.GetUnionSelector() if manifestSignature else TPM_ALG_ID.NULL
+        return self.manifestSignature.GetUnionSelector() if self.manifestSignature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -16483,7 +16483,7 @@ def __init__(self, moreData = 0, capabilityData = None):
     @property
     def capabilityDataCapability(self): # TPM_CAP
         """ The capability """
-        return capabilityData.GetUnionSelector()
+        return self.capabilityData.GetUnionSelector()
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -16528,7 +16528,7 @@ def __init__(self, parameters = None):
     @property
     def parametersType(self): # TPM_ALG_ID
         """ The algorithm to be tested """
-        return parameters.GetUnionSelector()
+        return self.parameters.GetUnionSelector()
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -17222,7 +17222,7 @@ def __init__(self, signHandle = TPM_HANDLE(), authHandle = TPM_HANDLE(), nvIndex
     @property
     def inSchemeScheme(self): # TPM_ALG_ID
         """ Scheme selector """
-        return inScheme.GetUnionSelector() if inScheme else TPM_ALG_ID.NULL
+        return self.inScheme.GetUnionSelector() if self.inScheme else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
@@ -17284,7 +17284,7 @@ def __init__(self, certifyInfo = None, signature = None):
     @property
     def signatureSigAlg(self): # TPM_ALG_ID
         """ Selector of the algorithm used to construct the signature """
-        return signature.GetUnionSelector() if signature else TPM_ALG_ID.NULL
+        return self.signature.GetUnionSelector() if self.signature else TPM_ALG_ID.NULL
 
     def toTpm(self, buf):
         """ TpmMarshaller method """
diff --git a/TssCodeGen/src/CGenPy.cs b/TssCodeGen/src/CGenPy.cs
index defb7e20..52765506 100644
--- a/TssCodeGen/src/CGenPy.cs
+++ b/TssCodeGen/src/CGenPy.cs
@@ -263,10 +263,10 @@ void GenStruct(TpmStruct s)
                     TabIn($"def {sel.Name}({This}): # {sel.TypeName}");
                     WriteComment(sel.Comment);
                     if (u.NullSelector == null)
-                        Write($"return {unionField.Name}.GetUnionSelector()");
+                        Write($"return self.{unionField.Name}.GetUnionSelector()");
                     else
                     {
-                        Write($"return {unionField.Name}.GetUnionSelector() if {unionField.Name}" +
+                        Write($"return self.{unionField.Name}.GetUnionSelector() if self.{unionField.Name}" +
                                                                          $" else {u.NullSelector.QualifiedName}");
                     }
                     TabOut();