Index: /ossiedev/branches/mcarrick/ossiedev-trunk/waveforms/CostasLoopDemo/CostasLoopDemo.sad.xml
===================================================================
--- /ossiedev/branches/mcarrick/ossiedev-trunk/waveforms/CostasLoopDemo/CostasLoopDemo.sad.xml	(revision 9253)
+++ /ossiedev/branches/mcarrick/ossiedev-trunk/waveforms/CostasLoopDemo/CostasLoopDemo.sad.xml	(revision 9306)
@@ -4,6 +4,6 @@
 <softwareassembly id="DCE:e1a85dc2-824a-11dc-93f8-00123f63025f" name="OSSIE::ossie_demo">
     <componentfiles>
-        <componentfile id="QPSKDataSource_11f5daf9-8b0d-4bb1-90db-2bd9d27e60f8" type="SPD">
-            <localfile name="/xml/QPSKDataSource/QPSKDataSource.spd.xml"/>
+        <componentfile id="CarrierDataSource_11f5daf9-8b0d-4bb1-90db-2bd9d27e60f8" type="SPD">
+            <localfile name="/xml/CarrierDataSource/CarrierDataSource.spd.xml"/>
         </componentfile>
         <componentfile id="CostasLoop_fd7d17f6-492e-4db6-9009-1aaf353b38d1" type="SPD">
@@ -13,12 +13,12 @@
     <partitioning>
         <componentplacement>
-            <componentfileref refid="QPSKDataSource_11f5daf9-8b0d-4bb1-90db-2bd9d27e60f8"/>
+            <componentfileref refid="CarrierDataSource_11f5daf9-8b0d-4bb1-90db-2bd9d27e60f8"/>
             <componentinstantiation id="DCE:c655b2dd-7e1a-4e59-831a-a7f205ddafac">
                 <componentproperties>
                     <simpleref description="" name="normFreqOfCarrier" refid="DCE:3c417c52-291e-11de-b541-001d092f0ea2" value="0.785"/>
                 </componentproperties>
-                <usagename>QPSKDataSource1</usagename> 
+                <usagename>CarrierDataSource1</usagename> 
                 <findcomponent>
-                    <namingservice name="QPSKDataSource1"/>
+                    <namingservice name="CarrierDataSource1"/>
                 </findcomponent>
             </componentinstantiation>
@@ -48,5 +48,5 @@
                 <usesidentifier>dataOut</usesidentifier> 
                 <findby>
-                    <namingservice name="QPSKDataSource1"/>
+                    <namingservice name="CarrierDataSource1"/>
                 </findby>
             </usesport>
Index: /ossiedev/branches/mcarrick/ossiedev-trunk/waveforms/CostasLoopDemo/CostasLoopDemo_DAS.xml
===================================================================
--- /ossiedev/branches/mcarrick/ossiedev-trunk/waveforms/CostasLoopDemo/CostasLoopDemo_DAS.xml	(revision 9256)
+++ /ossiedev/branches/mcarrick/ossiedev-trunk/waveforms/CostasLoopDemo/CostasLoopDemo_DAS.xml	(revision 9306)
@@ -6,5 +6,5 @@
     <deviceassignmentsequence>
         <deviceassignmenttype>
-            <!-- QPSKDataSource  -->
+            <!-- CarrierDataSource  -->
             <componentid>DCE:c655b2dd-7e1a-4e59-831a-a7f205ddafac</componentid> 
             <assigndeviceid>DCE:4b08ce96-fc5c-11dd-9347-001d092f0ea2</assigndeviceid>