diff --git a/Analyses/SCCM - Windows.bes b/Analyses/SCCM - Windows.bes
index 092a48c..d171e99 100644
--- a/Analyses/SCCM - Windows.bes	
+++ b/Analyses/SCCM - Windows.bes	
@@ -10,16 +10,16 @@
 		<Source>Internal</Source>
 		<SourceReleaseDate>2016-07-12</SourceReleaseDate>
 		<Domain>BESC</Domain>
-		<Property Name="SCCM - Version - Windows" ID="1" EvaluationPeriod="P1D">version of service "CcmExec"</Property>
-		<Property Name="SCCM - Site Code - Windows" ID="2" EvaluationPeriod="PT12H">value "LastSiteCode" of Key "HKEY_LOCAL_MACHINE\Software\Microsoft\CCM\CcmEval" of native registry</Property>
-		<Property Name="SCCM - Last Inventory Report - Windows" ID="3" EvaluationPeriod="PT1H">time value of selects "LastReportDate from InventoryActionStatus where InventoryActionID = '{00000000-0000-0000-0000-000000000001}'" of wmi "root\ccm\InvAgt"</Property>
-		<Property Name="SCCM - Management Point - Windows" ID="4" EvaluationPeriod="PT1H">string value of select "CurrentManagementPoint from SMS_Authority" of wmi "root\ccm"</Property>
-		<Property Name="SCCM - Installed Components - Windows" ID="5" EvaluationPeriod="P1D">unique values of string values of selects "DisplayName from CCM_InstalledComponent" of wmi "root\ccm"</Property>
-		<Property Name="SCCM - Client Approved - Windows" ID="6" EvaluationPeriod="PT6H">boolean value of selects "Approved from CCM_ClientIdentificationInformation" of wmi "root\ccm"</Property>
-		<Property Name="SCCM - Proxy Management Point - Windows" ID="7" EvaluationPeriod="PT12H">string value of select "Name from SMS_LocalMP" of wmi "root\ccm"</Property>
-		<Property Name="SCCM - Package Advertisements - Windows" ID="8" EvaluationPeriod="PT12H">(string value of property "PKG_NAME" of it, string value of property "PolicyID" of it) of select objects "* from CCM_SoftwareDistribution" of wmi "root\ccm\Policy\Machine\RequestedConfig"</Property>
-		<Property Name="SCCM - Max Cache Size - Windows" ID="9" EvaluationPeriod="PT12H">integer value of selects "Size from CacheConfig" of WMI "ROOT\ccm\SoftMgmtAgent"</Property>
-		<Property Name="SCCM - Missing Updates - Windows" ID="10" EvaluationPeriod="PT12H">unique values of string values of selects "Title from CCM_UpdateStatus WHERE Status='Missing'" of WMI "ROOT\ccm\SoftwareUpdates\UpdatesStore"</Property>
-		<Property Name="SCCM - State - Windows" ID="11" EvaluationPeriod="PT1H">state of service "CcmExec"</Property>
+		<Property Name="SCCM - Version - Windows" ID="1" EvaluationPeriod="P1D">versions of services "CcmExec"</Property>
+		<Property Name="SCCM - Site Code - Windows" ID="2" EvaluationPeriod="PT12H">values "LastSiteCode" of keys "HKEY_LOCAL_MACHINE\Software\Microsoft\CCM\CcmEval" of native registry</Property>
+		<Property Name="SCCM - Last Inventory Report - Windows" ID="3" EvaluationPeriod="PT1H">time values of selects "LastReportDate from InventoryActionStatus where InventoryActionID = '{00000000-0000-0000-0000-000000000001}'" of wmis "root\ccm\InvAgt"</Property>
+		<Property Name="SCCM - Management Point - Windows" ID="4" EvaluationPeriod="PT1H">string values of select "CurrentManagementPoint from SMS_Authority" of wmis "root\ccm"</Property>
+		<Property Name="SCCM - Installed Components - Windows" ID="5" EvaluationPeriod="P1D">unique values of string values of selects "DisplayName from CCM_InstalledComponent" of wmis "root\ccm"</Property>
+		<Property Name="SCCM - Client Approved - Windows" ID="6" EvaluationPeriod="PT6H">boolean values of selects "Approved from CCM_ClientIdentificationInformation" of wmis "root\ccm"</Property>
+		<Property Name="SCCM - Proxy Management Point - Windows" ID="7" EvaluationPeriod="PT12H">string values of selects "Name from SMS_LocalMP" of wmis "root\ccm"</Property>
+		<Property Name="SCCM - Package Advertisements - Windows" ID="8" EvaluationPeriod="PT12H">(string value of property "PKG_NAME" of it, string value of property "PolicyID" of it) of select objects "* from CCM_SoftwareDistribution" of wmis "root\ccm\Policy\Machine\RequestedConfig"</Property>
+		<Property Name="SCCM - Max Cache Size - Windows" ID="9" EvaluationPeriod="PT12H">integer values of selects "Size from CacheConfig" of WMIs "ROOT\ccm\SoftMgmtAgent"</Property>
+		<Property Name="SCCM - Missing Updates - Windows" ID="10" EvaluationPeriod="PT12H">unique values of string values of selects "Title from CCM_UpdateStatus WHERE Status='Missing'" of WMIs "ROOT\ccm\SoftwareUpdates\UpdatesStore"</Property>
+		<Property Name="SCCM - State - Windows" ID="11" EvaluationPeriod="PT1H">states of services "CcmExec"</Property>
 	</Analysis>
 </BES>