diff --git a/Module/Rule.Group/Convert/GroupRule.Convert.psm1 b/Module/Rule.Group/Convert/GroupRule.Convert.psm1 index 12577de3..21354f02 100644 --- a/Module/Rule.Group/Convert/GroupRule.Convert.psm1 +++ b/Module/Rule.Group/Convert/GroupRule.Convert.psm1 @@ -46,7 +46,7 @@ Class GroupRuleConvert : GroupRule { if ($this.IsDuplicateRule($global:stigSettings)) { - $this.SetDuplicateTitle() + $this.SetDuplicateOf($this.id) } } diff --git a/Module/Rule.IISLogging/Convert/IISLoggingRule.Convert.psm1 b/Module/Rule.IISLogging/Convert/IISLoggingRule.Convert.psm1 index 0503685e..04555fad 100644 --- a/Module/Rule.IISLogging/Convert/IISLoggingRule.Convert.psm1 +++ b/Module/Rule.IISLogging/Convert/IISLoggingRule.Convert.psm1 @@ -47,24 +47,15 @@ Class IisLoggingRuleConvert : IisLoggingRule $this.SetLogPeriod() $this.SetLogTargetW3C() $this.SetStatus() - $this.DscResource = $( - if ($global:stigTitle -match "Server") - { - "xIISLogging" - } - else - { - "XWebsite" - } - ) if ($this.conversionstatus -eq 'pass') { if ($this.IsDuplicateRule($global:stigSettings)) { - $this.SetDuplicateTitle() + $this.SetDuplicateOf($this.id) } } + $this.SetDscResource() } <# diff --git a/Module/Rule.WindowsFeature/Convert/WindowsFeatureRule.Convert.psm1 b/Module/Rule.WindowsFeature/Convert/WindowsFeatureRule.Convert.psm1 index 9767afd9..40f6b11d 100644 --- a/Module/Rule.WindowsFeature/Convert/WindowsFeatureRule.Convert.psm1 +++ b/Module/Rule.WindowsFeature/Convert/WindowsFeatureRule.Convert.psm1 @@ -47,7 +47,7 @@ Class WindowsFeatureRuleConvert : WindowsFeatureRule { if ($this.IsDuplicateRule($global:stigSettings)) { - $this.SetDuplicateTitle() + $this.SetDuplicateOf($this.id) } } $this.SetDscResource() diff --git a/Tools/TestHelper/TestHelper.psm1 b/Tools/TestHelper/TestHelper.psm1 index 9559ed4f..ec023789 100644 --- a/Tools/TestHelper/TestHelper.psm1 +++ b/Tools/TestHelper/TestHelper.psm1 @@ -211,7 +211,7 @@ Function Get-StigBaseMethods else { $objectClassMethodNames = @('Equals', 'GetHashCode', 'GetType', 'ToString') - $stigClassMethodNames = @('Clone', 'IsDuplicateRule', 'SetDuplicateTitle', 'SetStatus', + $stigClassMethodNames = @('Clone', 'IsDuplicateRule', 'SetDuplicateOf', 'SetStatus', 'SetIsNullOrEmpty', 'SetOrganizationValueRequired', 'GetOrganizationValueTestString', 'ConvertToHashTable', 'IsHardCoded', 'GetHardCodedString', 'IsHardCodedOrganizationValueTestString', 'GetHardCodedOrganizationValueTestString',