[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "rename" created.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu Dec 29 11:00:13 CST 2011


branch "rename" has been created
        at  2c0296fa6bf65e766cf1052aa3eb48147bb29bed (commit)

- Log -----------------------------------------------------------------
commit 2c0296fa6bf65e766cf1052aa3eb48147bb29bed
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu Dec 29 11:00:09 2011 -0600

    Adjust names in media_rtp_pjmedia

diff --git a/slice/AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice b/slice/AsteriskSCF/Configuration/MediaRTPPJMEDIA/RTPConfigurationIf.ice
similarity index 84%
rename from slice/AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice
rename to slice/AsteriskSCF/Configuration/MediaRTPPJMEDIA/RTPConfigurationIf.ice
index 7853123..8bc07d9 100644
--- a/slice/AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice
+++ b/slice/AsteriskSCF/Configuration/MediaRTPPJMEDIA/RTPConfigurationIf.ice
@@ -25,7 +25,7 @@ module AsteriskSCF
 module Configuration
 {
 
-module MediaRTPPJMedia
+module MediaRTPPJMEDIA
 {
 
 ["suppress"]
@@ -34,40 +34,40 @@ module V1
     /**
      * Service locator category for finding the configuration service
      */
-    const string ConfigurationDiscoveryCategory = "RtpConfiguration";
+    const string ConfigurationDiscoveryCategory = "RTPConfiguration";
 
     /**
      * Local visitor class for visiting RTP configuration groups
      */
-    local class RtpConfigurationGroupVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationGroupVisitor
+    local class RTPConfigurationGroupVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationGroupVisitor
     {
     };
 
     /**
      * Generic RTP configuration group
      */
-    ["visitor:RtpConfigurationGroupVisitor"] class RtpConfigurationGroup extends AsteriskSCF::System::Configuration::V1::ConfigurationGroup
+    ["visitor:RTPConfigurationGroupVisitor"] class RTPConfigurationGroup extends AsteriskSCF::System::Configuration::V1::ConfigurationGroup
     {
     };
 
     /**
      * General RTP configuration group that contains general items related to the RTP component as a whole
      */
-    class RtpGeneralGroup extends RtpConfigurationGroup
+    class RTPGeneralGroup extends RTPConfigurationGroup
     {
     };
 
     /**
      * Local visitor class for visiting RTP configuration items
      */
-    local class RtpConfigurationItemVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationItemVisitor
+    local class RTPConfigurationItemVisitor extends AsteriskSCF::System::Configuration::V1::ConfigurationItemVisitor
     {
     };
 
     /**
      * Generic RTP configuration item
      */
-    ["visitor:RtpConfigurationItemVisitor"] class RtpConfigurationItem extends AsteriskSCF::System::Configuration::V1::ConfigurationItem
+    ["visitor:RTPConfigurationItemVisitor"] class RTPConfigurationItem extends AsteriskSCF::System::Configuration::V1::ConfigurationItem
     {
     };
 
@@ -83,7 +83,7 @@ module V1
      * in PortRangesItemName
      *
      */
-    class PortRangesItem extends RtpConfigurationItem
+    class PortRangesItem extends RTPConfigurationItem
     {
         /**
          * Start port for RTP and RTCP sockets.
@@ -112,7 +112,7 @@ module V1
      * Enable SRTP on the current transport.
      *
      **/
-    class EnableSRTPItem extends RtpConfigurationItem
+    class EnableSRTPItem extends RTPConfigurationItem
     {
         /**
          * Flag to enable SRTP.
@@ -132,7 +132,7 @@ module V1
      * in WorkerThreadCountItemName
      *
      */
-    class WorkerThreadCountItem extends RtpConfigurationItem
+    class WorkerThreadCountItem extends RTPConfigurationItem
     {
         /**
          * Number of threads that should handle incoming media.
@@ -150,7 +150,7 @@ module V1
     /**
      * Binding address for IPv4 traffic
      */
-    class BindingIPv4Item extends RtpConfigurationItem
+    class BindingIPv4Item extends RTPConfigurationItem
     {
         /**
          * Address that IPv4 sessions should be binded to.
@@ -168,7 +168,7 @@ module V1
     /**
      * Binding address for IPv6 traffic
      */
-    class BindingIPv6Item extends RtpConfigurationItem
+    class BindingIPv6Item extends RTPConfigurationItem
     {
         /**
          * Address that IPv6 sessions should be binded to.
@@ -181,7 +181,7 @@ module V1
     /*
      * Configuration group for ICE enabled RTP.
      */
-    class RTPICEConfigurationGroup extends RtpConfigurationGroup
+    class RTPICEConfigurationGroup extends RTPConfigurationGroup
     {
     };
 
@@ -193,7 +193,7 @@ module V1
     /**
      * Hostname for the STUN server.
      */
-    class STUNServerItem extends RtpConfigurationItem
+    class STUNServerItem extends RTPConfigurationItem
     {
         string address;
         int port;
@@ -207,7 +207,7 @@ module V1
     /**
      * Hostname for the TURN server.
      */
-    class TURNServerItem extends RtpConfigurationItem
+    class TURNServerItem extends RTPConfigurationItem
     {
         string address;
         int port;
@@ -221,7 +221,7 @@ module V1
     /**
      * Configuration item with option flags for the ICE transport.
      */
-    class RTPICETransportFlagsItem extends RtpConfigurationItem
+    class RTPICETransportFlagsItem extends RTPConfigurationItem
     {
         /**
          * If the configuration option is present, it's most likely
@@ -245,7 +245,7 @@ module V1
     /**
      * Configuration item for configurable limits for the ICE transport.
      */
-    class RTPICETransportLimitsItem extends RtpConfigurationItem
+    class RTPICETransportLimitsItem extends RTPConfigurationItem
     {
         /**
          * The maximum number of candidates to gather and publish.
@@ -260,7 +260,7 @@ module V1
 
 }; /* module V1 */
 
-}; /* module MediaRTPPJMedia */
+}; /* module MediaRTPPJMEDIA */
 
 }; /* module Configuration */
 
diff --git a/slice/AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice b/slice/AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice
similarity index 79%
rename from slice/AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice
rename to slice/AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice
index 3651d1d..952efd1 100644
--- a/slice/AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice
@@ -30,44 +30,44 @@ module AsteriskSCF
 module Replication
 {
 
-module MediaRTPPJMedia
+module MediaRTPPJMEDIA
 {
 
 ["suppress"]
 module V1
 {
-    const string StateReplicatorComponentCategory = "RtpStateReplicatorComponent";
-    const string StateReplicatorDiscoveryCategory = "RtpStateReplicator";
+    const string StateReplicatorComponentCategory = "RTPStateReplicatorComponent";
+    const string StateReplicatorDiscoveryCategory = "RTPStateReplicator";
     
-    ["visitor"] local class RtpStateItemVisitor
+    ["visitor"] local class RTPStateItemVisitor
     {
     };
 
-    ["visitor:RtpStateItemVisitor"] class RtpStateItem
+    ["visitor:RTPStateItemVisitor"] class RTPStateItem
     {
 	string key;
 	string sessionId;
     };
 
-    sequence<RtpStateItem> RtpStateItemSeq;
+    sequence<RTPStateItem> RTPStateItemSeq;
 
-    interface RtpStateReplicatorListener
+    interface RTPStateReplicatorListener
     {
 	void stateRemoved(Ice::StringSeq itemKeys);
-	void stateSet(RtpStateItemSeq items);
+	void stateSet(RTPStateItemSeq items);
     };
 
-    interface RtpStateReplicator
+    interface RTPStateReplicator
     {
-	void addListener(RtpStateReplicatorListener *listener);
-	void removeListener(RtpStateReplicatorListener *listener);
-	void setState (RtpStateItemSeq items);
+	void addListener(RTPStateReplicatorListener *listener);
+	void removeListener(RTPStateReplicatorListener *listener);
+	void setState (RTPStateItemSeq items);
 	void removeState(Ice::StringSeq items);
-	idempotent RtpStateItemSeq getState(Ice::StringSeq itemKeys);
-	idempotent RtpStateItemSeq getAllState();
+	idempotent RTPStateItemSeq getState(Ice::StringSeq itemKeys);
+	idempotent RTPStateItemSeq getAllState();
     };
 
-    class RtpGeneralStateItem extends RtpStateItem
+    class RTPGeneralStateItem extends RTPStateItem
     {
 	AsteriskSCF::Core::Discovery::V1::ServiceManagement *serviceManagement;
 	string comparatorId;
@@ -76,7 +76,7 @@ module V1
     /**
      * TODO: Data members in Slice defined classes should not have `m' prefixes.
      */
-    class RtpSessionStateItem extends RtpStateItem
+    class RTPSessionStateItem extends RTPStateItem
     {
 	Ice::Identity sessionIdentity;
 	int port;
@@ -94,19 +94,19 @@ module V1
         AsteriskSCF::Media::V1::SessionCookieDict cookies;
     };
 
-    class RtpStreamSinkStateItem extends RtpStateItem
+    class RTPStreamSinkStateItem extends RTPStateItem
     {
 	AsteriskSCF::Media::V1::StreamSource *source;
 	string remoteAddress;
 	int remotePort;
     };
 
-    class RtpStreamSourceStateItem extends RtpStateItem
+    class RTPStreamSourceStateItem extends RTPStateItem
     {
 	AsteriskSCF::Media::V1::StreamSinkSeq sinks;
     };
 
-    class RTPTelephonyEventSinkStateItem extends RtpStateItem
+    class RTPTelephonyEventSinkStateItem extends RTPStateItem
     {
         /**
          * RFC 4733 events' duration field is only 16-bits, and the
@@ -131,7 +131,7 @@ module V1
         AsteriskSCF::SessionCommunications::V1::TelephonyEventSource* source;
     };
 
-    class RTPTelephonyEventSourceStateItem extends RtpStateItem
+    class RTPTelephonyEventSourceStateItem extends RTPStateItem
     {
         /**
          * When processing incoming RFC 4733 events, typically 3 end packets
@@ -156,7 +156,7 @@ module V1
 
 }; /* module V1 */
 
-}; /* module MediaRTPPJMedia */
+}; /* module MediaRTPPJMEDIA */
 
 }; /* module Replication */
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8dad694..d14e800 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,20 +12,20 @@ astscf_component_add_files(media_rtp_pjmedia RTPSession.h)
 astscf_component_add_files(media_rtp_pjmedia RTPSource.h)
 astscf_component_add_files(media_rtp_pjmedia RTPTelephonyEventSource.h)
 astscf_component_add_files(media_rtp_pjmedia RTPSink.h)
-astscf_component_add_files(media_rtp_pjmedia RtpReplicationContext.h)
+astscf_component_add_files(media_rtp_pjmedia RTPReplicationContext.h)
 astscf_component_add_files(media_rtp_pjmedia RTPTelephonyEventSink.h)
-astscf_component_add_files(media_rtp_pjmedia RtpStateReplicatorListener.cpp)
-astscf_component_add_files(media_rtp_pjmedia RtpStateReplicator.h)
+astscf_component_add_files(media_rtp_pjmedia RTPStateReplicatorListener.cpp)
+astscf_component_add_files(media_rtp_pjmedia RTPStateReplicator.h)
 astscf_component_add_files(media_rtp_pjmedia RTPConfiguration.cpp)
 astscf_component_add_files(media_rtp_pjmedia RTPConfiguration.h)
-astscf_component_add_files(media_rtp_pjmedia PJLibConfiguration.cpp)
-astscf_component_add_files(media_rtp_pjmedia PJLibConfiguration.h)
-astscf_component_add_files(media_rtp_pjmedia PJMediaEnvironment.cpp)
-astscf_component_add_files(media_rtp_pjmedia PJMediaEnvironment.h)
-astscf_component_add_files(media_rtp_pjmedia PJMediaTransport.cpp)
-astscf_component_add_files(media_rtp_pjmedia PJMediaTransport.h)
-astscf_component_add_files(media_rtp_pjmedia PJMediaEndpoint.cpp)
-astscf_component_add_files(media_rtp_pjmedia PJMediaEndpoint.h)
+astscf_component_add_files(media_rtp_pjmedia PJLIBConfiguration.cpp)
+astscf_component_add_files(media_rtp_pjmedia PJLIBConfiguration.h)
+astscf_component_add_files(media_rtp_pjmedia PJMEDIAEnvironment.cpp)
+astscf_component_add_files(media_rtp_pjmedia PJMEDIAEnvironment.h)
+astscf_component_add_files(media_rtp_pjmedia PJMEDIATransport.cpp)
+astscf_component_add_files(media_rtp_pjmedia PJMEDIATransport.h)
+astscf_component_add_files(media_rtp_pjmedia PJMEDIAEndpoint.cpp)
+astscf_component_add_files(media_rtp_pjmedia PJMEDIAEndpoint.h)
 astscf_component_add_files(media_rtp_pjmedia UDPTransport.cpp)
 astscf_component_add_files(media_rtp_pjmedia UDPTransport.h)
 astscf_component_add_files(media_rtp_pjmedia PJUtil.h)
@@ -44,8 +44,8 @@ astscf_component_add_files(media_rtp_pjmedia SRTPConfiguration.cpp)
 astscf_component_add_files(media_rtp_pjmedia SRTPConfiguration.h)
 astscf_component_add_files(media_rtp_pjmedia SRTPTransport.cpp)
 astscf_component_add_files(media_rtp_pjmedia SRTPTransport.h)
-astscf_component_add_slices(media_rtp_pjmedia PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
-astscf_component_add_slices(media_rtp_pjmedia PROJECT AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice)
+astscf_component_add_slices(media_rtp_pjmedia PROJECT AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice)
+astscf_component_add_slices(media_rtp_pjmedia PROJECT AsteriskSCF/Configuration/MediaRTPPJMEDIA/RTPConfigurationIf.ice)
 astscf_component_add_boost_libraries(media_rtp_pjmedia core thread)
 astscf_component_add_slice_collection_libraries(media_rtp_pjmedia ASTSCF)
 astscf_component_build_icebox(media_rtp_pjmedia)
@@ -57,14 +57,14 @@ pjproject_link(media_rtp_pjmedia pjmedia)
 pjproject_link(media_rtp_pjmedia pjnath)
 astscf_component_install(media_rtp_pjmedia)
 
-astscf_component_init(RtpStateReplicator)
-astscf_component_add_files(RtpStateReplicator RtpStateReplicatorApp.cpp)
-astscf_component_add_files(RtpStateReplicator RtpStateReplicator.h)
-astscf_component_add_slices(RtpStateReplicator PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
-astscf_component_add_slices(RtpStateReplicator PROJECT AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice)
-astscf_component_add_ice_libraries(RtpStateReplicator IceStorm)
-astscf_component_add_boost_libraries(RtpStateReplicator thread date_time)
-astscf_component_add_slice_collection_libraries(RtpStateReplicator ASTSCF)
-astscf_component_build_icebox(RtpStateReplicator)
-target_link_libraries(RtpStateReplicator LoggingClient ASTSCFIceUtilCpp)
-astscf_component_install(RtpStateReplicator)
+astscf_component_init(RTPStateReplicator)
+astscf_component_add_files(RTPStateReplicator RTPStateReplicatorApp.cpp)
+astscf_component_add_files(RTPStateReplicator RTPStateReplicator.h)
+astscf_component_add_slices(RTPStateReplicator PROJECT AsteriskSCF/Replication/MediaRTPPJMEDIA/RTPStateReplicationIf.ice)
+astscf_component_add_slices(RTPStateReplicator PROJECT AsteriskSCF/Configuration/MediaRTPPJMEDIA/RTPConfigurationIf.ice)
+astscf_component_add_ice_libraries(RTPStateReplicator IceStorm)
+astscf_component_add_boost_libraries(RTPStateReplicator thread date_time)
+astscf_component_add_slice_collection_libraries(RTPStateReplicator ASTSCF)
+astscf_component_build_icebox(RTPStateReplicator)
+target_link_libraries(RTPStateReplicator LoggingClient ASTSCFIceUtilCpp)
+astscf_component_install(RTPStateReplicator)
diff --git a/src/Component.cpp b/src/Component.cpp
index 1293994..b470522 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -31,34 +31,34 @@
 #include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Discovery/SmartProxy.h>
 #include <AsteriskSCF/Component/Component.h>
-#include <AsteriskSCF/PJLib/ThreadHook.h>
+#include <AsteriskSCF/PJLIB/ThreadHook.h>
 
-#include "RtpReplicationContext.h"
+#include "RTPReplicationContext.h"
 #include "RTPSession.h"
-#include "RtpStateReplicator.h"
+#include "RTPStateReplicator.h"
 #include "RTPConfiguration.h"
-#include "RtpConfigurationIf.h"
-#include "PJMediaEnvironment.h"
+#include "RTPConfigurationIf.h"
+#include "PJMEDIAEnvironment.h"
 
 using namespace std;
 using namespace AsteriskSCF::Core::Discovery::V1;
 using namespace AsteriskSCF::Media::V1;
 using namespace AsteriskSCF::Media::RTP::V1;
-using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
-using namespace AsteriskSCF::Configuration::MediaRTPPJMedia::V1;
+using namespace AsteriskSCF::Replication::MediaRTPPJMEDIA::V1;
+using namespace AsteriskSCF::Configuration::MediaRTPPJMEDIA::V1;
 using namespace AsteriskSCF::System::Configuration::V1;
 using namespace AsteriskSCF::System::Component::V1;
 using namespace AsteriskSCF::System::Logging;
 using namespace AsteriskSCF::Discovery;
 using namespace AsteriskSCF::Replication;
-using namespace AsteriskSCF::PJMediaRTP;
+using namespace AsteriskSCF::PJMEDIARTP;
 
 namespace
 {
 Logger lg = getLoggerFactory().getLogger("AsteriskSCF.MediaRTP");
 }
 
-static const string ReplicaServiceId("MediaRtpReplica");
+static const string ReplicaServiceId("MediaRTPReplica");
 static const string MediaServiceId("RTPMediaService");
 static const string MediaComparatorServiceId("RTPMediaServiceComparator");
 
@@ -69,7 +69,7 @@ class RTPMediaServiceImpl : public RTPMediaService
 {
 public:
     RTPMediaServiceImpl(const Ice::ObjectAdapterPtr&,
-      const RtpReplicationContextPtr& replicationContext,
+      const RTPReplicationContextPtr& replicationContext,
       const ConfigurationServiceImplPtr&);
 
     RTPSessionPrx allocate(
@@ -80,19 +80,19 @@ public:
 
     pj_pool_factory *getPoolFactory() { return mEnvironment->poolFactory(); };
 
-    PJMediaEnvironmentPtr getEnvironment()
+    PJMEDIAEnvironmentPtr getEnvironment()
     {
         return mEnvironment;
     }
 
 private:
     Ice::ObjectAdapterPtr mAdapter;
-    PJMediaEnvironmentPtr mEnvironment;
-    RtpReplicationContextPtr mReplicationContext;
+    PJMEDIAEnvironmentPtr mEnvironment;
+    RTPReplicationContextPtr mReplicationContext;
     ConfigurationServiceImplPtr mConfigurationService;
 
 #if CONTROL_POINTS_ENABLED
-    AsteriskSCF::PJMediaRTPTesting mMediaServiceSwitchBoard;
+    AsteriskSCF::PJMEDIARTPTesting mMediaServiceSwitchBoard;
 #endif
 };
 
@@ -184,7 +184,7 @@ class Component : public AsteriskSCF::Component::Component
 public:
     Component() :
        AsteriskSCF::Component::Component(lg, AsteriskSCF::Media::RTP::V1::ComponentServiceDiscoveryCategory),
-      mListeningToReplicator(false), mGeneralState(new RtpGeneralStateItem()) { mGeneralState->key = IceUtil::generateUUID(); };
+      mListeningToReplicator(false), mGeneralState(new RTPGeneralStateItem()) { mGeneralState->key = IceUtil::generateUUID(); };
 
 private:
     // Required base Component overrides
@@ -211,22 +211,22 @@ private:
     ServiceManagementPrx mComponentServiceManagement;
 
     // State replicator listener.
-    RtpStateReplicatorListenerPtr mReplicatorListener;
-    RtpStateReplicatorListenerPrx mReplicatorListenerProxy;
+    RTPStateReplicatorListenerPtr mReplicatorListener;
+    RTPStateReplicatorListenerPrx mReplicatorListenerProxy;
     bool mListeningToReplicator;
 
     // An instance of the general state information class.
-    RtpGeneralStateItemPtr mGeneralState;
+    RTPGeneralStateItemPtr mGeneralState;
 
     // Media service
-    RTPMediaServiceImplPtr mRtpMediaServicePtr;
-    RTPMediaServicePrx mRtpMediaServicePrx;
-    LocatorRegistrationWrapperPtr mRtpMediaServiceRegistration;
+    RTPMediaServiceImplPtr mRTPMediaServicePtr;
+    RTPMediaServicePrx mRTPMediaServicePrx;
+    LocatorRegistrationWrapperPtr mRTPMediaServiceRegistration;
 
     // Media comparator service
-    ServiceLocatorParamsComparePtr mRtpMediaComparatorService;
-    ServiceLocatorParamsComparePrx mRtpMediaComparatorServicePrx;
-    RTPOverICEServiceLocatorParamsPtr mRtpOverIceLocatorParams;
+    ServiceLocatorParamsComparePtr mRTPMediaComparatorService;
+    ServiceLocatorParamsComparePrx mRTPMediaComparatorServicePrx;
+    RTPOverICEServiceLocatorParamsPtr mRTPOverIceLocatorParams;
 
     // Configuration state
     ConfigurationServiceImplPtr mConfigurationService;
@@ -248,10 +248,10 @@ void Component::onResume()
  * Constructor for the RTPMediaServiceImpl class.
  */
 RTPMediaServiceImpl::RTPMediaServiceImpl(const Ice::ObjectAdapterPtr& adapter,
-    const RtpReplicationContextPtr& replicationContext,
+    const RTPReplicationContextPtr& replicationContext,
     const ConfigurationServiceImplPtr& configurationService) :
     mAdapter(adapter),
-    mEnvironment(PJMediaEnvironment::create(adapter->getCommunicator()->getProperties(), configurationService)),
+    mEnvironment(PJMEDIAEnvironment::create(adapter->getCommunicator()->getProperties(), configurationService)),
     mReplicationContext(replicationContext),
     mConfigurationService(configurationService)
 {
@@ -266,7 +266,7 @@ RTPSessionPrx RTPMediaServiceImpl::allocate(
         RTPAllocationOutputsPtr& outputs,
         const Ice::Current&)
 {
-    return AsteriskSCF::PJMediaRTP::RTPSession::create(
+    return AsteriskSCF::PJMEDIARTP::RTPSession::create(
             mAdapter,
             IceUtil::generateUUID(),
             params,
@@ -284,7 +284,7 @@ void Component::onPreInitialize()
 	lg(Info) << "Initializing pjmedia rtp component" << endl;
 
 	Ice::InitializationData id;
-	id.threadHook = new AsteriskSCF::PJLib::ThreadHook("Ice");
+	id.threadHook = new AsteriskSCF::PJLIB::ThreadHook("Ice");
 	id.properties = getCommunicator()->getProperties();
 
 	// To use our thread-hook, we need to set an alternate
@@ -302,7 +302,7 @@ void Component::onPreInitialize()
  */
 ReplicationContextPtr Component::createReplicationContext(ReplicationStateType state)
 {
-    RtpReplicationContextPtr context(new RtpReplicationContext(state));
+    RTPReplicationContextPtr context(new RTPReplicationContext(state));
     return context;
 }
 
@@ -314,29 +314,29 @@ void Component::createPrimaryServices()
 {
     try
     {
-        RtpReplicationContextPtr rtpReplicationContext =
-            boost::static_pointer_cast<RtpReplicationContext>(getReplicationContext());
+        RTPReplicationContextPtr rtpReplicationContext =
+            boost::static_pointer_cast<RTPReplicationContext>(getReplicationContext());
 
         mConfigurationService = ConfigurationServiceImpl::create();
         mConfigurationServicePrx = mConfigurationService->activate(getBackplaneAdapter(), IceUtil::generateUUID());
 
-        mRtpMediaServicePtr =
+        mRTPMediaServicePtr =
            new RTPMediaServiceImpl(getServiceAdapter(), rtpReplicationContext, mConfigurationService);
-        mRtpMediaServicePrx = RTPMediaServicePrx::uncheckedCast(getServiceAdapter()->add(mRtpMediaServicePtr,
+        mRTPMediaServicePrx = RTPMediaServicePrx::uncheckedCast(getServiceAdapter()->add(mRTPMediaServicePtr,
            getCommunicator()->stringToIdentity(MediaServiceId)));
 
-        mRtpMediaComparatorService = new RTPMediaServiceCompareServiceImpl(mConfigurationService);
-        mRtpMediaComparatorServicePrx = ServiceLocatorParamsComparePrx::uncheckedCast(
-              getServiceAdapter()->add(mRtpMediaComparatorService,
+        mRTPMediaComparatorService = new RTPMediaServiceCompareServiceImpl(mConfigurationService);
+        mRTPMediaComparatorServicePrx = ServiceLocatorParamsComparePrx::uncheckedCast(
+              getServiceAdapter()->add(mRTPMediaComparatorService,
                   getCommunicator()->stringToIdentity(MediaComparatorServiceId)));
 
 
-        mRtpOverIceLocatorParams = new RTPOverICEServiceLocatorParams;
-        mRtpOverIceLocatorParams->category = "rtp";
-        mRtpOverIceLocatorParams->service =
+        mRTPOverIceLocatorParams = new RTPOverICEServiceLocatorParams;
+        mRTPOverIceLocatorParams->category = "rtp";
+        mRTPOverIceLocatorParams->service =
             getCommunicator()->getProperties()->getPropertyWithDefault(getName() + ".ServiceName", "default");
-        mRtpOverIceLocatorParams->id = getName();
-        PJMediaEnvironmentPtr mediaEnvironment = mRtpMediaServicePtr->getEnvironment();
+        mRTPOverIceLocatorParams->id = getName();
+        PJMEDIAEnvironmentPtr mediaEnvironment = mRTPMediaServicePtr->getEnvironment();
 
         //
         // Service wide configuration is done through properties allowing certain features
@@ -345,19 +345,19 @@ void Component::createPrimaryServices()
         NATConfigPtr natConfig = mediaEnvironment->natConfig();
         if (natConfig && natConfig->isSTUNEnabled())
         {
-            mRtpOverIceLocatorParams->enableRTPOverICE = true;
-            mRtpOverIceLocatorParams->enableTURN = natConfig->isTURNEnabled();
+            mRTPOverIceLocatorParams->enableRTPOverICE = true;
+            mRTPOverIceLocatorParams->enableTURN = natConfig->isTURNEnabled();
         }
         else
         {
-            mRtpOverIceLocatorParams->enableRTPOverICE = false;
-            mRtpOverIceLocatorParams->enableTURN = false;
+            mRTPOverIceLocatorParams->enableRTPOverICE = false;
+            mRTPOverIceLocatorParams->enableTURN = false;
         }
 
         if (rtpReplicationContext->isActive() == true)
         {
             mGeneralState->comparatorId = IceUtil::generateUUID();
-            getServiceLocatorManagement()->addCompare(mGeneralState->comparatorId, mRtpMediaComparatorServicePrx);
+            getServiceLocatorManagement()->addCompare(mGeneralState->comparatorId, mRTPMediaComparatorServicePrx);
         }
 
     }
@@ -404,10 +404,10 @@ void Component::findRemoteServices()
 
     try
     {
-        RtpReplicationContextPtr rtpReplicationContext =
-            boost::static_pointer_cast<RtpReplicationContext>(getReplicationContext());
+        RTPReplicationContextPtr rtpReplicationContext =
+            boost::static_pointer_cast<RTPReplicationContext>(getReplicationContext());
 
-        AsteriskSCF::Discovery::SmartProxy<RtpStateReplicatorPrx> pw(getServiceLocator(), replicatorParams, lg);
+        AsteriskSCF::Discovery::SmartProxy<RTPStateReplicatorPrx> pw(getServiceLocator(), replicatorParams, lg);
         rtpReplicationContext->setReplicator(pw);
 
         // Since we're not in standalone mode, we'll get our configuration updates routed via the
@@ -427,15 +427,15 @@ void Component::createReplicationStateListeners()
 {
     try
     {
-        RtpReplicationContextPtr rtpReplicationContext =
-            boost::static_pointer_cast<RtpReplicationContext>(getReplicationContext());
+        RTPReplicationContextPtr rtpReplicationContext =
+            boost::static_pointer_cast<RTPReplicationContext>(getReplicationContext());
 
        // Create and publish our state replicator listener interface.
-        mReplicatorListener = new RtpStateReplicatorListenerI(getServiceAdapter(), mRtpMediaServicePtr->getEnvironment(),
+        mReplicatorListener = new RTPStateReplicatorListenerI(getServiceAdapter(), mRTPMediaServicePtr->getEnvironment(),
             mGeneralState, rtpReplicationContext, mConfigurationService);
-        RtpStateReplicatorListenerPrx replicatorListener = RtpStateReplicatorListenerPrx::uncheckedCast(
+        RTPStateReplicatorListenerPrx replicatorListener = RTPStateReplicatorListenerPrx::uncheckedCast(
              getBackplaneAdapter()->addWithUUID(mReplicatorListener));
-        mReplicatorListenerProxy = RtpStateReplicatorListenerPrx::uncheckedCast(replicatorListener->ice_oneway());
+        mReplicatorListenerProxy = RTPStateReplicatorListenerPrx::uncheckedCast(replicatorListener->ice_oneway());
 
         lg(Debug) << "Got proxy to RTP state replicator";
     }
@@ -448,8 +448,8 @@ void Component::createReplicationStateListeners()
 
 void Component::listenToStateReplicators()
 {
-    RtpReplicationContextPtr rtpReplicationContext =
-        boost::static_pointer_cast<RtpReplicationContext>(getReplicationContext());
+    RTPReplicationContextPtr rtpReplicationContext =
+        boost::static_pointer_cast<RTPReplicationContext>(getReplicationContext());
 
     if (mListeningToReplicator == true)
     {
@@ -485,8 +485,8 @@ void Component::listenToStateReplicators()
  */
 void Component::stopListeningToStateReplicators()
 {
-    RtpReplicationContextPtr rtpReplicationContext =
-        boost::static_pointer_cast<RtpReplicationContext>(getReplicationContext());
+    RTPReplicationContextPtr rtpReplicationContext =
+        boost::static_pointer_cast<RTPReplicationContext>(getReplicationContext());
 
     if ((!rtpReplicationContext->getReplicator().isInitialized()) || (mListeningToReplicator == false))
     {
@@ -513,9 +513,9 @@ void Component::preparePrimaryServicesForDiscovery()
 {
     try
     {
-        mRtpMediaServiceRegistration = wrapServiceForRegistration(mRtpMediaServicePrx,
+        mRTPMediaServiceRegistration = wrapServiceForRegistration(mRTPMediaServicePrx,
                                                                   "rtp");
-        managePrimaryService(mRtpMediaServiceRegistration);
+        managePrimaryService(mRTPMediaServiceRegistration);
     }
         catch(const std::exception& e)
     {
@@ -532,8 +532,8 @@ void Component::onRegisterPrimaryServices()
         return;
     }
 
-    mGeneralState->serviceManagement = mRtpMediaServiceRegistration->getServiceManagement();
-    mGeneralState->serviceManagement->addLocatorParams(mRtpOverIceLocatorParams, mGeneralState->comparatorId);
+    mGeneralState->serviceManagement = mRTPMediaServiceRegistration->getServiceManagement();
+    mGeneralState->serviceManagement->addLocatorParams(mRTPOverIceLocatorParams, mGeneralState->comparatorId);
 }
 
 void Component::onStart()
@@ -544,12 +544,12 @@ void Component::onStart()
     // couldn't already determine itself.
     if (getReplicationContext()->isReplicating() == true)
     {
-        RtpReplicationContextPtr rtpReplicationContext =
-            boost::static_pointer_cast<RtpReplicationContext>(getReplicationContext());
+        RTPReplicationContextPtr rtpReplicationContext =
+            boost::static_pointer_cast<RTPReplicationContext>(getReplicationContext());
 
-        RtpStateItemSeq items;
+        RTPStateItemSeq items;
         items.push_back(mGeneralState);
-        RtpStateReplicatorPrx oneway = RtpStateReplicatorPrx::uncheckedCast(rtpReplicationContext->getReplicator()->ice_oneway());
+        RTPStateReplicatorPrx oneway = RTPStateReplicatorPrx::uncheckedCast(rtpReplicationContext->getReplicator()->ice_oneway());
         oneway->setState(items);
     }
 }
diff --git a/src/Configuration.h b/src/Configuration.h
index dbe7f25..c679852 100755
--- a/src/Configuration.h
+++ b/src/Configuration.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "PJLibConfiguration.h"
+#include "PJLIBConfiguration.h"
 #include "NATConfig.h"
 #include "ICEConfiguration.h"
 #include "SRTPConfiguration.h"
@@ -27,7 +27,7 @@
 
 namespace AsteriskSCF
 {
-namespace PJMediaRTP
+namespace PJMEDIARTP
 {
 
 /**
@@ -39,7 +39,7 @@ class RTPConfiguration : public virtual IceUtil::Shared
 public:
     virtual ~RTPConfiguration() {}
 
-    virtual PJLibConfigurationPtr libConfig() const = 0;
+    virtual PJLIBConfigurationPtr libConfig() const = 0;
     virtual NATConfigPtr natConfig() const = 0;
     virtual ICEConfigurationPtr ICEConfig() const = 0;
     virtual SRTPConfigurationPtr srtpConfig() const = 0;
@@ -53,5 +53,5 @@ public:
 
 typedef IceUtil::Handle<RTPConfiguration> RTPConfigurationPtr;
 
-} /* End of namespace PJMediaRTP */
+} /* End of namespace PJMEDIARTP */
 } /* End of namespace AsteriskSCF */
diff --git a/src/ICEConfiguration.cpp b/src/ICEConfiguration.cpp
index 4ea0aaf..15a91ef 100644
--- a/src/ICEConfiguration.cpp
+++ b/src/ICEConfiguration.cpp
@@ -18,9 +18,9 @@
 #include <Ice/Properties.h>
 
 using namespace std;
-using namespace AsteriskSCF::PJMediaRTP;
+using namespace AsteriskSCF::PJMEDIARTP;
 
-ICEConfigurationPtr AsteriskSCF::PJMediaRTP::ICEConfiguration::create(int maxCand, int maxClls)
+ICEConfigurationPtr AsteriskSCF::PJMEDIARTP::ICEConfiguration::create(int maxCand, int maxClls)
 {
     return ICEConfigurationPtr(new ICEConfiguration(maxCand, maxClls));
 }
diff --git a/src/ICEConfiguration.h b/src/ICEConfiguration.h
index 450d4df..d81774c 100644
--- a/src/ICEConfiguration.h
+++ b/src/ICEConfiguration.h
@@ -22,7 +22,7 @@
 
 namespace AsteriskSCF
 {
-namespace PJMediaRTP
+namespace PJMEDIARTP
 {
 
 class ICEConfiguration;
@@ -64,5 +64,5 @@ private:
     void operator=(const ICEConfiguration&);
 };
 
-} /* End of namespace PJMediaRTP */
+} /* End of namespace PJMEDIARTP */
 } /* End of namespace AsteriskSCF */
diff --git a/src/ICETransport.cpp b/src/ICETransport.cpp
index 333f9f1..994b1ad 100644
--- a/src/ICETransport.cpp
+++ b/src/ICETransport.cpp
@@ -32,7 +32,7 @@
 #include <AsteriskSCF/Logger.h>
 #include <IceUtil/UUID.h>
 
-using namespace AsteriskSCF::PJMediaRTP;
+using namespace AsteriskSCF::PJMEDIARTP;
 using namespace AsteriskSCF::System::V1;
 using namespace AsteriskSCF::PJUtil;
 using namespace std;
@@ -52,8 +52,8 @@ class ICEAgentImpl : public InteractiveConnectionAgent
 {
 public:
 
-    ICEAgentImpl(const Ice::ObjectAdapterPtr& adapter, const Ice::Identity& id, const PJMediaEnvironmentPtr& env,
-        const PJMediaEndpointPtr& ep) :
+    ICEAgentImpl(const Ice::ObjectAdapterPtr& adapter, const Ice::Identity& id, const PJMEDIAEnvironmentPtr& env,
+        const PJMEDIAEndpointPtr& ep) :
         mAdapter(adapter),
         mId(id),
         mShuttingDown(false),
@@ -499,8 +499,8 @@ private:
     DetectedNATType mNATType;
     Role mRole;
     CandidateSeq mCandidates;
-    PJMediaEnvironmentPtr mEnv;
-    PJMediaEndpointPtr mEndpoint;
+    PJMEDIAEnvironmentPtr mEnv;
+    PJMEDIAEndpointPtr mEndpoint;
     pjmedia_transport* mTransport;
     AMD_InteractiveConnectionAgent_negotiatePtr mCurrentNegotiation;
 
@@ -765,7 +765,7 @@ void ICETransport::addFacets(const Ice::ObjectAdapterPtr& adapter, const Ice::Id
     adapter->addFacet(agent, id, InteractiveConnectionAgentFacetName);
 }
 
-ICETransportPtr ICETransport::create(const PJMediaEndpointPtr& ep, const PJMediaEnvironmentPtr& config)
+ICETransportPtr ICETransport::create(const PJMEDIAEndpointPtr& ep, const PJMEDIAEnvironmentPtr& config)
 {
     ICETransportPtr transport(new ICETransport(ep, config));
     transport->start();
@@ -777,8 +777,8 @@ ICETransportPtr ICETransport::create(const PJMediaEndpointPtr& ep, const PJMedia
     return transport;
 }
 
-ICETransport::ICETransport(const PJMediaEndpointPtr& ep, const PJMediaEnvironmentPtr& configObject) :
-    PJMediaTransport(0),
+ICETransport::ICETransport(const PJMEDIAEndpointPtr& ep, const PJMEDIAEnvironmentPtr& configObject) :
+    PJMEDIATransport(0),
     mEndpoint(ep),
     mConfig(configObject),
     mEnableRTCP(false)
diff --git a/src/ICETransport.h b/src/ICETransport.h
index 678a830..7a30cca 100644
--- a/src/ICETransport.h
+++ b/src/ICETransport.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "PJMediaTransport.h"
-#include "PJMediaEndpoint.h"
-#include "PJMediaEnvironment.h"
+#include "PJMEDIATransport.h"
+#include "PJMEDIAEndpoint.h"
+#include "PJMEDIAEnvironment.h"
 #include <Ice/PropertiesF.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
@@ -33,7 +33,7 @@ struct pjmedia_ice_cb;
 
 namespace AsteriskSCF
 {
-namespace PJMediaRTP
+namespace PJMEDIARTP
 {
 
 class ICETransport;
@@ -41,7 +41,7 @@ typedef boost::shared_ptr<ICETransport> ICETransportPtr;
 typedef boost::shared_ptr<pjmedia_ice_cb> PJICECallbackPtr;
 typedef boost::shared_ptr<pj_sockaddr> PJSockAddrPtr;
 
-class ICETransport : public boost::enable_shared_from_this<ICETransport>,  public PJMediaTransport
+class ICETransport : public boost::enable_shared_from_this<ICETransport>,  public PJMEDIATransport
 {
 public:
 
@@ -49,7 +49,7 @@ public:
     void onSetupComplete(pjmedia_transport* transport, int status);
 
     //
-    // Overrides of PJMediaTransport
+    // Overrides of PJMEDIATransport
     //
     AsteriskSCF::Helpers::AddressPtr localAddress();
     AsteriskSCF::Helpers::AddressPtr remoteAddress();
@@ -60,7 +60,7 @@ public:
      * before the enable_shared_from_this<> base class/template instantiation.
      **/
     static ICETransportPtr
-        create(const PJMediaEndpointPtr& ep, const PJMediaEnvironmentPtr& configObject);
+        create(const PJMEDIAEndpointPtr& ep, const PJMEDIAEnvironmentPtr& configObject);
 
 private:
     boost::mutex mLock;
@@ -70,11 +70,11 @@ private:
     PJICECallbackPtr mCallback;
     PJSockAddrPtr mLastKnownAddr;
     NATModulePtr mNATModule;
-    PJMediaEndpointPtr mEndpoint;
-    PJMediaEnvironmentPtr mConfig;
+    PJMEDIAEndpointPtr mEndpoint;
+    PJMEDIAEnvironmentPtr mConfig;
     bool mEnableRTCP;
 
-    ICETransport(const PJMediaEndpointPtr& ep, const PJMediaEnvironmentPtr& configObject);
+    ICETransport(const PJMEDIAEndpointPtr& ep, const PJMEDIAEnvironmentPtr& configObject);
 
     void start();
 
@@ -86,5 +86,5 @@ private:
 };
 
 
-} /* End of namespace PJMediaRTP */
+} /* End of namespace PJMEDIARTP */
 } /* End of namespace AsteriskSCF */
diff --git a/src/NATConfig.cpp b/src/NATConfig.cpp
index 3320faf..b049787 100644
--- a/src/NATConfig.cpp
+++ b/src/NATConfig.cpp
@@ -24,7 +24,7 @@
 using namespace std;
 using namespace AsteriskSCF::Helpers;
 using namespace AsteriskSCF::System::V1;
-using namespace AsteriskSCF::PJMediaRTP;
+using namespace AsteriskSCF::PJMEDIARTP;
 using namespace AsteriskSCF::System::Logging;
 
 namespace
diff --git a/src/NATConfig.h b/src/NATConfig.h
index ac87662..ce802a6 100644
--- a/src/NATConfig.h
+++ b/src/NATConfig.h
@@ -23,7 +23,7 @@
 
 namespace AsteriskSCF
 {
-namespace PJMediaRTP
+namespace PJMEDIARTP
 {
 
 class NATConfig;
@@ -72,5 +72,5 @@ private:
     NATConfig(const NATConfig&);
     void operator=(const NATConfig&);
 };
-} /* End of namespace PJMediaRTP */
+} /* End of namespace PJMEDIARTP */
 } /* End of namespace AsteriskSCF */
diff --git a/src/NATModule.cpp b/src/NATModule.cpp
index 3b5636f..85670fc 100644
--- a/src/NATModule.cpp
+++ b/src/NATModule.cpp
@@ -20,12 +20,12 @@
 #include "PJUtil.h"
 #include <AsteriskSCF/System/ExceptionsIf.h>
 
-using namespace AsteriskSCF::PJMediaRTP;
+using namespace AsteriskSCF::PJMEDIARTP;
 using namespace AsteriskSCF::System::V1;
 using namespace AsteriskSCF::PJUtil;
 
-NATModulePtr AsteriskSCF::PJMediaRTP::NATModule::create(const PJMediaEnvironmentPtr& env,
-    const PJMediaEndpointPtr& endpoint)
+NATModulePtr AsteriskSCF::PJMEDIARTP::NATModule::create(const PJMEDIAEnvironmentPtr& env,
+    const PJMEDIAEndpointPtr& endpoint)
 {
     boost::shared_ptr<pj_ice_strans_cfg> transcfg(new pj_ice_strans_cfg);
     pj_ice_strans_cfg_default(transcfg.get());
diff --git a/src/NATModule.h b/src/NATModule.h
index fa834ef..3d51c9e 100644
--- a/src/NATModule.h
+++ b/src/NATModule.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "PJMediaEnvironment.h"
-#include "PJMediaEndpoint.h"
+#include "PJMEDIAEnvironment.h"
+#include "PJMEDIAEndpoint.h"
 #include <boost/shared_ptr.hpp>
 
 //
@@ -27,7 +27,7 @@ struct pj_ice_strans_cfg;
 
 namespace AsteriskSCF
 {
-namespace PJMediaRTP
+namespace PJMEDIARTP
 {
 class NATModule;
 typedef boost::shared_ptr<NATModule> NATModulePtr;
@@ -42,7 +42,7 @@ public:
         return mTransactionConfig.get();
     }
 
-    static NATModulePtr create(const PJMediaEnvironmentPtr& environ, const PJMediaEndpointPtr& endpoint);
+    static NATModulePtr create(const PJMEDIAEnvironmentPtr& environ, const PJMEDIAEndpointPtr& endpoint);
 
 private:
     boost::shared_ptr<pj_ice_strans_cfg> mTransactionConfig;
@@ -59,5 +59,5 @@ private:
     void operator=(const NATModule&);
 };
 
-} /* End of namespace PJMediaRTP */
+} /* End of namespace PJMEDIARTP */
 } /* End of namespace AsteriskSCF */
diff --git a/src/PJLibConfiguration.cpp b/src/PJLIBConfiguration.cpp
similarity index 66%
rename from src/PJLibConfiguration.cpp
rename to src/PJLIBConfiguration.cpp
index 654f3fe..88a325f 100644
--- a/src/PJLibConfiguration.cpp
+++ b/src/PJLIBConfiguration.cpp
@@ -14,19 +14,19 @@
  * at the top of the source tree.
  */
 
-#include "PJLibConfiguration.h"
+#include "PJLIBConfiguration.h"
 #include <Ice/Properties.h>
 
 using namespace std;
-using namespace AsteriskSCF::PJMediaRTP;
+using namespace AsteriskSCF::PJMEDIARTP;
 
-PJLibConfigurationPtr AsteriskSCF::PJMediaRTP::PJLibConfiguration::create(const Ice::PropertiesPtr& props)
+PJLIBConfigurationPtr AsteriskSCF::PJMEDIARTP::PJLIBConfiguration::create(const Ice::PropertiesPtr& props)
 {
-    int timerHeapSize = props->getPropertyAsIntWithDefault("PJMedia.TimerHeap.Size", 1000); 
-    return PJLibConfigurationPtr(new PJLibConfiguration(timerHeapSize));
+    int timerHeapSize = props->getPropertyAsIntWithDefault("PJMEDIA.TimerHeap.Size", 1000); 
+    return PJLIBConfigurationPtr(new PJLIBConfiguration(timerHeapSize));
 }
 
-PJLibConfiguration::PJLibConfiguration(int heapSize) :
+PJLIBConfiguration::PJLIBConfiguration(int heapSize) :
     mTimerHeapSize(heapSize)
 {
 }
diff --git a/src/PJLibConfiguration.h b/src/PJLIBConfiguration.h
similarity index 75%
rename from src/PJLibConfiguration.h
rename to src/PJLIBConfiguration.h
index 3e09288..2241a18 100644
--- a/src/PJLibConfiguration.h
+++ b/src/PJLIBConfiguration.h
@@ -22,17 +22,17 @@
 
 namespace AsteriskSCF
 {
-namespace PJMediaRTP
+namespace PJMEDIARTP
 {
 
 /**
  *
- * PJLibConfiguration is fairly minimal at the moment, but may grow in the future. The intent is to reduce code
+ * PJLIBConfiguration is fairly minimal at the moment, but may grow in the future. The intent is to reduce code
  * duplication when dealing with pjproject related configuration. This is also an immutable object, so locking is not an
  * issue.
  *
  **/
-class PJLibConfiguration
+class PJLIBConfiguration
 {
 public:
 
@@ -45,21 +45,21 @@ public:
      * Create configuration instance from Ice properties.  TODO: This could be extended by adding additional factory
      * overrides.
      **/
-    static boost::shared_ptr<PJLibConfiguration> create(const Ice::PropertiesPtr& props);
+    static boost::shared_ptr<PJLIBConfiguration> create(const Ice::PropertiesPtr& props);
 
 private:
     int mTimerHeapSize;
 
-    PJLibConfiguration(int timerHeapSize);
+    PJLIBConfiguration(int timerHeapSize);
 
     //
     // Hidden, not implemented.
     //
-    PJLibConfiguration(const PJLibConfiguration&);
-    void operator=(const PJLibConfiguration&);
+    PJLIBConfiguration(const PJLIBConfiguration&);
+    void operator=(const PJLIBConfiguration&);
 };
 
-typedef boost::shared_ptr<PJLibConfiguration> PJLibConfigurationPtr;
+typedef boost::shared_ptr<PJLIBConfiguration> PJLIBConfigurationPtr;
 
-} /* end of namespace PJMediaRTP */
+} /* end of namespace PJMEDIARTP */
 } /* End of namespace AsteriskSCF */
diff --git a/src/PJMediaEndpoint.cpp b/src/PJMEDIAEndpoint.cpp
similarity index 75%
rename from src/PJMediaEndpoint.cpp
rename to src/PJMEDIAEndpoint.cpp
index 96d192c..97092ec 100644
--- a/src/PJMediaEndpoint.cpp
+++ b/src/PJMEDIAEndpoint.cpp
@@ -14,21 +14,21 @@
  * at the top of the source tree.
  */
 
-#include "PJMediaEndpoint.h"
+#include "PJMEDIAEndpoint.h"
 #include "PJUtil.h"
 #include <AsteriskSCF/System/ExceptionsIf.h>
 #include <pjmedia.h>
 
-using namespace AsteriskSCF::PJMediaRTP;
+using namespace AsteriskSCF::PJMEDIARTP;
 using namespace AsteriskSCF::System::V1;
 using namespace AsteriskSCF::PJUtil;
 
-PJMediaEndpoint::~PJMediaEndpoint()
+PJMEDIAEndpoint::~PJMEDIAEndpoint()
 {
     pjmedia_endpt_destroy(mEndpoint);
 }
 
-PJMediaEndpointPtr AsteriskSCF::PJMediaRTP::PJMediaEndpoint::create(const PJMediaEnvironmentPtr& env)
+PJMEDIAEndpointPtr AsteriskSCF::PJMEDIARTP::PJMEDIAEndpoint::create(const PJMEDIAEnvironmentPtr& env)
 {
     pjmedia_endpt* t;
     pj_status_t result =  pjmedia_endpt_create(env->poolFactory(), 0, 1, &t);
@@ -36,10 +36,10 @@ PJMediaEndpointPtr AsteriskSCF::PJMediaRTP::PJMediaEndpoint::create(const PJMedi
     {
         throw InternalInitializationException("Unable to create media endpoint!");
     }
-    return PJMediaEndpointPtr(new PJMediaEndpoint(t));
+    return PJMEDIAEndpointPtr(new PJMEDIAEndpoint(t));
 }
 
-PJMediaEndpoint::PJMediaEndpoint(pjmedia_endpt* endpt) :
+PJMEDIAEndpoint::PJMEDIAEndpoint(pjmedia_endpt* endpt) :
     mEndpoint(endpt)
 {
 }
diff --git a/src/PJMediaEndpoint.h b/src/PJMEDIAEndpoint.h
similarity index 68%
rename from src/PJMediaEndpoint.h
rename to src/PJMEDIAEndpoint.h
index 86ce0e4..93c614e 100644
--- a/src/PJMediaEndpoint.h
+++ b/src/PJMEDIAEndpoint.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "PJMediaEnvironment.h"
+#include "PJMEDIAEnvironment.h"
 #include <boost/shared_ptr.hpp>
 
 //
@@ -26,35 +26,35 @@ struct pjmedia_endpt;
 
 namespace AsteriskSCF
 {
-namespace PJMediaRTP
+namespace PJMEDIARTP
 {
 
-class PJMediaEndpoint;
-typedef boost::shared_ptr<PJMediaEndpoint> PJMediaEndpointPtr;
+class PJMEDIAEndpoint;
+typedef boost::shared_ptr<PJMEDIAEndpoint> PJMEDIAEndpointPtr;
 
-class PJMediaEndpoint
+class PJMEDIAEndpoint
 {
 public:
 
-    ~PJMediaEndpoint();
+    ~PJMEDIAEndpoint();
 
     pjmedia_endpt* endpoint() const
     {
         return mEndpoint;
     }
 
-    static PJMediaEndpointPtr create(const PJMediaEnvironmentPtr& environ);
+    static PJMEDIAEndpointPtr create(const PJMEDIAEnvironmentPtr& environ);
 
 private:
     pjmedia_endpt* mEndpoint;
 
-    PJMediaEndpoint(pjmedia_endpt* endpoint);
+    PJMEDIAEndpoint(pjmedia_endpt* endpoint);
 
     //
     // Hidden and unimplemented.
     //
-    PJMediaEndpoint(const PJMediaEndpoint&);
-    void operator=(const PJMediaEndpoint&);
+    PJMEDIAEndpoint(const PJMEDIAEndpoint&);
+    void operator=(const PJMEDIAEndpoint&);
 };
-} /* End of namespace PJMediaRTP */
+} /* End of namespace PJMEDIARTP */
 } /* End of namespace AsteriskSCF */
diff --git a/src/PJMediaEnvironment.cpp b/src/PJMEDIAEnvironment.cpp
similarity index 82%
rename from src/PJMediaEnvironment.cpp
rename to src/PJMEDIAEnvironment.cpp
index 8de76b8..2983073 100644
--- a/src/PJMediaEnvironment.cpp
+++ b/src/PJMEDIAEnvironment.cpp
@@ -14,7 +14,7 @@
  * at the top of the source tree.
  */
 
-#include "PJMediaEnvironment.h"
+#include "PJMEDIAEnvironment.h"
 #include <Ice/Properties.h>
 #include <pjlib.h>
 #include <pjmedia.h>
@@ -23,22 +23,22 @@
 #include <AsteriskSCF/System/ExceptionsIf.h>
 
 using namespace std;
-using namespace AsteriskSCF::PJMediaRTP;
+using namespace AsteriskSCF::PJMEDIARTP;
 using namespace AsteriskSCF::System::V1;
 using namespace AsteriskSCF::PJUtil;
 
 //
-// The main work of creating the various objects is done by the factory, not the PJMediaEnvironment constructor.
+// The main work of creating the various objects is done by the factory, not the PJMEDIAEnvironment constructor.
 //
-PJMediaEnvironmentPtr AsteriskSCF::PJMediaRTP::PJMediaEnvironment::create(const Ice::PropertiesPtr& props,
+PJMEDIAEnvironmentPtr AsteriskSCF::PJMEDIARTP::PJMEDIAEnvironment::create(const Ice::PropertiesPtr& props,
         const RTPConfigurationPtr& configObject)
 {
-    return PJMediaEnvironmentPtr(new PJMediaEnvironment(PJLibConfiguration::create(props), configObject));
+    return PJMEDIAEnvironmentPtr(new PJMEDIAEnvironment(PJLIBConfiguration::create(props), configObject));
 }
         
-PJMediaEnvironment::PJMediaEnvironment(const PJLibConfigurationPtr& libCfg,
+PJMEDIAEnvironment::PJMEDIAEnvironment(const PJLIBConfigurationPtr& libCfg,
         const RTPConfigurationPtr& configObject) :
-    mPJLibConfig(libCfg),
+    mPJLIBConfig(libCfg),
     mConfiguration(configObject),
     mCachingPool(new pj_caching_pool)
 {
diff --git a/src/PJMediaEnvironment.h b/src/PJMEDIAEnvironment.h
similarity index 82%
rename from src/PJMediaEnvironment.h
rename to src/PJMEDIAEnvironment.h
index dc4d39d..67e604a 100644
--- a/src/PJMediaEnvironment.h
+++ b/src/PJMEDIAEnvironment.h
@@ -32,39 +32,39 @@ struct pj_caching_pool;
 
 namespace AsteriskSCF
 {
-namespace PJMediaRTP
+namespace PJMEDIARTP
 {
 
-class PJMediaEnvironment;
-typedef boost::shared_ptr<PJMediaEnvironment> PJMediaEnvironmentPtr;
+class PJMEDIAEnvironment;
+typedef boost::shared_ptr<PJMEDIAEnvironment> PJMEDIAEnvironmentPtr;
 
 /**
  *
- * PJMediaEnvironment pulls together all of the different configuration modules for the current pjproject library
+ * PJMEDIAEnvironment pulls together all of the different configuration modules for the current pjproject library
  * features. Objects that need this info should use these accessors instead of caching their own copies. The
- * PJMediaEnvironment can be updated with new configuration without affecting operations in progress. In progress
+ * PJMEDIAEnvironment can be updated with new configuration without affecting operations in progress. In progress
  * operations will simply use the version of the configuration that was available when it started. The exception to this
  * guideline is if there are multiple operations in a small scope that need a consistent version of the
  * configuration. In this case, that operation should keep a scope-local copy for the duration of those operations. This
  * can extend to AMI operations.
  *
- * PJMediaEnvironment provides accessors for the pool and pool factory used in so many pjX related operations. This
+ * PJMEDIAEnvironment provides accessors for the pool and pool factory used in so many pjX related operations. This
  * prevents having pj related details peppered throughout the method signatures.
  *
  * Generally speaking this object should be instantiated when the service is loaded *or* as soon as the relevant
  * configuration becomes available.
  *
  **/
-class PJMediaEnvironment
+class PJMEDIAEnvironment
 {
 public:
 
     /**
      * Get generic configuration object.
      */
-    PJLibConfigurationPtr libConfig() const
+    PJLIBConfigurationPtr libConfig() const
     {
-        return mPJLibConfig;
+        return mPJLIBConfig;
     }
 
     /**
@@ -93,7 +93,7 @@ public:
 
     /**
      * Get our library instance's main pool factory. As this function does not return a reference counted pointer, its
-     * value should not be cached at all. Its validity is directly related to the lifetime of the PJMediaEnvironment
+     * value should not be cached at all. Its validity is directly related to the lifetime of the PJMEDIAEnvironment
      * object.
      */
     pj_pool_factory* poolFactory() const
@@ -103,7 +103,7 @@ public:
     
     /**
      * Get the main memory pool. As this function does not return a reference counted pointer, its value should
-     * not be cached at all. Its validity is directly related to the lifetime of the PJMediaEnvironment object.
+     * not be cached at all. Its validity is directly related to the lifetime of the PJMEDIAEnvironment object.
      */
     pj_pool_t* memoryPool() const
     {
@@ -113,20 +113,20 @@ public:
     /**
      * Create an instance of the object based on the Ice properties.
      */
-    static PJMediaEnvironmentPtr create(const Ice::PropertiesPtr& props, const RTPConfigurationPtr& configObject);
+    static PJMEDIAEnvironmentPtr create(const Ice::PropertiesPtr& props, const RTPConfigurationPtr& configObject);
 
 private:
 
-    PJLibConfigurationPtr mPJLibConfig;
+    PJLIBConfigurationPtr mPJLIBConfig;
     RTPConfigurationPtr mConfiguration;
     
     pj_pool_factory* mPoolFactory;
     pj_pool_t* mMemoryPool;
     boost::shared_ptr<pj_caching_pool> mCachingPool;
 
-    PJMediaEnvironment(const PJLibConfigurationPtr& libConfig,
+    PJMEDIAEnvironment(const PJLIBConfigurationPtr& libConfig,
             const RTPConfigurationPtr& configObject);
 };
 
-} /* End of namespace PJMediaRTP */
+} /* End of namespace PJMEDIARTP */
 } /* End of namespace AsteriskSCF */
diff --git a/src/PJMediaTransport.cpp b/src/PJMEDIATransport.cpp
similarity index 80%
rename from src/PJMediaTransport.cpp
rename to src/PJMEDIATransport.cpp
index c646175..2546b8b 100644
--- a/src/PJMediaTransport.cpp
+++ b/src/PJMEDIATransport.cpp
@@ -14,7 +14,7 @@
  * at the top of the source tree.
  */
 
-#include "PJMediaTransport.h"
+#include "PJMEDIATransport.h"
 #include <pjmedia.h>
 #include <pjlib.h>
 #include <string>
@@ -23,30 +23,30 @@
 #endif
 
 using namespace std;
-using namespace AsteriskSCF::PJMediaRTP;
+using namespace AsteriskSCF::PJMEDIARTP;
 using namespace AsteriskSCF::Helpers;
 
-PJMediaTransport::~PJMediaTransport()
+PJMEDIATransport::~PJMEDIATransport()
 {
     pjmedia_transport_close(mTransport);
 }
 
-pjmedia_transport* PJMediaTransport::getTransport() const
+pjmedia_transport* PJMEDIATransport::getTransport() const
 {
     return mTransport;
 }
 
-PJMediaTransport::PJMediaTransport(pjmedia_transport* t) :
+PJMEDIATransport::PJMEDIATransport(pjmedia_transport* t) :
     mTransport(t)
 {
 }
 
-AddressPtr PJMediaTransport::localAddress() 
+AddressPtr PJMEDIATransport::localAddress() 
 {
     return getLocalAddressImpl();
 }
 
-AddressPtr PJMediaTransport::remoteAddress() 
+AddressPtr PJMEDIATransport::remoteAddress() 
 {
     pjmedia_transport_info info;
     pjmedia_transport_info_init(&info);
@@ -65,7 +65,7 @@ AddressPtr PJMediaTransport::remoteAddress()
     return fromInfo(info);
 }
 
-AddressPtr PJMediaTransport::getLocalAddressImpl() 
+AddressPtr PJMEDIATransport::getLocalAddressImpl() 
 {
     pjmedia_transport_info info;
     pjmedia_transport_info_init(&info);
@@ -73,7 +73,7 @@ AddressPtr PJMediaTransport::getLocalAddressImpl()
     return fromInfo(info);
 }
 
-AddressPtr PJMediaTransport::fromInfo(pjmedia_transport_info& info) 
+AddressPtr PJMEDIATransport::fromInfo(pjmedia_transport_info& info) 
 {
     char buff[PJ_INET6_ADDRSTRLEN];
     pj_sockaddr_print(&info.sock_info.rtp_addr_name, buff, sizeof(buff), 0);
diff --git a/src/PJMediaTransport.h b/src/PJMEDIATransport.h
similarity index 83%
rename from src/PJMediaTransport.h
rename to src/PJMEDIATransport.h
index ffaa5da..ca4889f 100644
--- a/src/PJMediaTransport.h
+++ b/src/PJMEDIATransport.h
@@ -29,17 +29,17 @@ struct pjmedia_transport_info;
 
 namespace AsteriskSCF
 {
-namespace PJMediaRTP
+namespace PJMEDIARTP
 {
 
-class PJMediaTransport;
-typedef boost::shared_ptr<PJMediaTransport> PJMediaTransportPtr;
+class PJMEDIATransport;
+typedef boost::shared_ptr<PJMEDIATransport> PJMEDIATransportPtr;
 
-class PJMediaTransport
+class PJMEDIATransport
 {
 public:
 
-    virtual ~PJMediaTransport();
+    virtual ~PJMEDIATransport();
 
     pjmedia_transport* getTransport() const;
 
@@ -58,7 +58,7 @@ public:
 protected:
     pjmedia_transport* mTransport;
 
-    PJMediaTransport(pjmedia_transport* t);
+    PJMEDIATransport(pjmedia_transport* t);
 
     AsteriskSCF::Helpers::AddressPtr getLocalAddressImpl();
     AsteriskSCF::Helpers::AddressPtr fromInfo(pjmedia_transport_info& info);
@@ -66,9 +66,9 @@ protected:
     //
     // Hidden and unimplemented.
     //
-    PJMediaTransport(const PJMediaTransport&);
-    void operator=(const PJMediaTransport&);
+    PJMEDIATransport(const PJMEDIATransport&);
+    void operator=(const PJMEDIATransport&);
 };
 
-} /* End of namespace PJMediaRTP */
+} /* End of namespace PJMEDIARTP */
 } /* End of namespace AsteriskSCF */
diff --git a/src/RTPConfiguration.cpp b/src/RTPConfiguration.cpp
index 1359fe4..3c5650a 100644
--- a/src/RTPConfiguration.cpp
+++ b/src/RTPConfiguration.cpp
@@ -14,7 +14,7 @@
  * at the top of the source tree.
  */
 
-#include "RtpConfigurationIf.h"
+#include "RTPConfigurationIf.h"
 #include "RTPConfiguration.h"
 
 #include <IceUtil/UUID.h>
@@ -24,9 +24,9 @@
 #include <boost/thread/shared_mutex.hpp>
 
 using namespace AsteriskSCF::System::Configuration::V1;
-using namespace AsteriskSCF::PJMediaRTP;
+using namespace AsteriskSCF::PJMEDIARTP;
 using namespace std;
-using namespace AsteriskSCF::Configuration::MediaRTPPJMedia::V1;
+using namespace AsteriskSCF::Configuration::MediaRTPPJMEDIA::V1;
 
 /**
  * Implementation of the configuration service.
@@ -55,7 +55,7 @@ public:
             const Ice::Current&);
 
     /**
-     * AsteriskSCF::PJMediaRTP::RTPConfiguration interface.
+     * AsteriskSCF::PJMEDIARTP::RTPConfiguration interface.
      */
     int getStartPort();
     int getEndPort();
@@ -64,9 +64,9 @@ public:
     std::string getBindIPv4Address();
     std::string getBindIPv6Address();
 
-    PJLibConfigurationPtr libConfig() const
+    PJLIBConfigurationPtr libConfig() const
     {
-        return PJLibConfigurationPtr(); // XXX this isn't implemented here at this time.
+        return PJLIBConfigurationPtr(); // XXX this isn't implemented here at this time.
     }
 
     NATConfigPtr natConfig() const
@@ -101,7 +101,7 @@ public:
         mSRTPConfig = newConfig;
     }
 
-    RtpGeneralGroupPtr getGeneralGroup()
+    RTPGeneralGroupPtr getGeneralGroup()
     {
         return mGeneralGroup;
     }
@@ -111,7 +111,7 @@ public:
         return mICEConfiguration;
     }
 
-    void replaceGroup(const RtpGeneralGroupPtr& group)
+    void replaceGroup(const RTPGeneralGroupPtr& group)
     {
         mGeneralGroup = group;
 
@@ -153,7 +153,7 @@ private:
     /**
      * General RTP configuration
      */
-    RtpGeneralGroupPtr mGeneralGroup;
+    RTPGeneralGroupPtr mGeneralGroup;
     RTPICEConfigurationGroupPtr mICEConfiguration;
 
     ICEConfigurationPtr mICEConfig;
@@ -171,7 +171,7 @@ typedef IceUtil::Handle<ConfigurationServiceServant> ConfigurationServiceServant
 ConfigurationGroupSeq ConfigurationServiceServant::getConfiguration(
     const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq& groups, const Ice::Current&)
 {
-    class GroupVisitor : public RtpConfigurationGroupVisitor
+    class GroupVisitor : public RTPConfigurationGroupVisitor
     {
     public:
         GroupVisitor(const ConfigurationServiceServantPtr& impl,
@@ -204,15 +204,15 @@ ConfigurationGroupSeq ConfigurationServiceServant::getConfiguration(
             }
         }
 
-        void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr& group)
+        void visitRTPGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMEDIA::V1::RTPGeneralGroupPtr& group)
         {
-            RtpGeneralGroupPtr currentGroup =  mImpl->getGeneralGroup();
+            RTPGeneralGroupPtr currentGroup =  mImpl->getGeneralGroup();
             if (currentGroup)
             {
                 return;
             }
 
-            RtpGeneralGroupPtr returnedGroup = new RtpGeneralGroup();
+            RTPGeneralGroupPtr returnedGroup = new RTPGeneralGroup();
 
             insertRequestedConfigurationItems(group->configurationItems,
                     currentGroup->configurationItems, returnedGroup->configurationItems);
@@ -239,7 +239,7 @@ ConfigurationGroupSeq ConfigurationServiceServant::getConfiguration(
     };
     
     ConfigurationGroupSeq newGroups;
-    RtpConfigurationGroupVisitorPtr v = new GroupVisitor(this, newGroups);
+    RTPConfigurationGroupVisitorPtr v = new GroupVisitor(this, newGroups);
     
     for (ConfigurationGroupSeq::const_iterator group = groups.begin(); group != groups.end(); ++group)
     {
@@ -252,7 +252,7 @@ ConfigurationGroupSeq ConfigurationServiceServant::getConfiguration(
 ConfigurationGroupSeq ConfigurationServiceServant::getConfigurationAll(
     const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq& groups, const Ice::Current&)
 {
-    class GroupVisitor : public RtpConfigurationGroupVisitor
+    class GroupVisitor : public RTPConfigurationGroupVisitor
     {
     public:
         GroupVisitor(const ConfigurationServiceServantPtr& impl, ConfigurationGroupSeq& visitorGroups) :
@@ -261,9 +261,9 @@ ConfigurationGroupSeq ConfigurationServiceServant::getConfigurationAll(
         }
  
     private:
-        void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr&)
+        void visitRTPGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMEDIA::V1::RTPGeneralGroupPtr&)
         {
-            RtpGeneralGroupPtr g = mImpl->getGeneralGroup();
+            RTPGeneralGroupPtr g = mImpl->getGeneralGroup();
             if (g)
             {
                 mGroups.push_back(g);
@@ -284,7 +284,7 @@ ConfigurationGroupSeq ConfigurationServiceServant::getConfigurationAll(
     };
     
     ConfigurationGroupSeq newGroups;
-    RtpConfigurationGroupVisitorPtr v = new GroupVisitor(this, newGroups);
+    RTPConfigurationGroupVisitorPtr v = new GroupVisitor(this, newGroups);
 
     boost::shared_lock<boost::shared_mutex> lock(mLock);
     
@@ -303,7 +303,7 @@ ConfigurationGroupSeq ConfigurationServiceServant::getConfigurationGroups(const
    
     if (mGeneralGroup)
     {
-        groups.push_back(new RtpGeneralGroup);
+        groups.push_back(new RTPGeneralGroup);
     }
     if (mICEConfiguration)
     {
@@ -316,7 +316,7 @@ ConfigurationGroupSeq ConfigurationServiceServant::getConfigurationGroups(const
 void ConfigurationServiceServant::setConfiguration(const ConfigurationGroupSeq& groups,
     const Ice::Current&)
 {
-    class GroupVisitor : public RtpConfigurationGroupVisitor
+    class GroupVisitor : public RTPConfigurationGroupVisitor
     {
     public:
         GroupVisitor(const ConfigurationServiceServantPtr& impl) : 
@@ -356,12 +356,12 @@ void ConfigurationServiceServant::setConfiguration(const ConfigurationGroupSeq&
             }
         }
  
-        void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr& group)
+        void visitRTPGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMEDIA::V1::RTPGeneralGroupPtr& group)
         {
-            RtpGeneralGroupPtr g = mImpl->getGeneralGroup();
+            RTPGeneralGroupPtr g = mImpl->getGeneralGroup();
             if (!g)
             {
-                g = new RtpGeneralGroup();
+                g = new RTPGeneralGroup();
             }
             else
             {
@@ -390,7 +390,7 @@ void ConfigurationServiceServant::setConfiguration(const ConfigurationGroupSeq&
             // sets data members to let it know what needs to be done when the
             // visiting is completed.
             //
-            class Visitor : public RtpConfigurationItemVisitor
+            class Visitor : public RTPConfigurationItemVisitor
             {
             public:
                 Visitor(const ConfigurationServiceServantPtr& configObject) :
@@ -480,7 +480,7 @@ void ConfigurationServiceServant::setConfiguration(const ConfigurationGroupSeq&
                 performSerialCheck(group->configurationItems, g->configurationItems, group);
             }
 
-            RtpConfigurationItemVisitorPtr v(new Visitor(mImpl));
+            RTPConfigurationItemVisitorPtr v(new Visitor(mImpl));
      
             for (ConfigurationItemDict::const_iterator item = group->configurationItems.begin();
                  item != group->configurationItems.end();
@@ -496,7 +496,7 @@ void ConfigurationServiceServant::setConfiguration(const ConfigurationGroupSeq&
         ConfigurationServiceServantPtr mImpl;
     };
     
-    RtpConfigurationGroupVisitorPtr v = new GroupVisitor(this);
+    RTPConfigurationGroupVisitorPtr v = new GroupVisitor(this);
 
     boost::unique_lock<boost::shared_mutex> lock(mLock);
     for (ConfigurationGroupSeq::const_iterator group = groups.begin(); group != groups.end(); ++group)
@@ -508,7 +508,7 @@ void ConfigurationServiceServant::setConfiguration(const ConfigurationGroupSeq&
 void ConfigurationServiceServant::removeConfigurationItems(
     const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq& groups, const Ice::Current&)
 {
-    class GroupVisitor : public RtpConfigurationGroupVisitor
+    class GroupVisitor : public RTPConfigurationGroupVisitor
     {
     public:
         GroupVisitor(const ConfigurationServiceServantPtr& impl) : 
@@ -516,7 +516,7 @@ void ConfigurationServiceServant::removeConfigurationItems(
         {
         }
 
-        void removeItems(const RtpConfigurationItemVisitorPtr& visitor, ConfigurationItemDict& itemsToRemove,
+        void removeItems(const RTPConfigurationItemVisitorPtr& visitor, ConfigurationItemDict& itemsToRemove,
             ConfigurationItemDict& localItems)
         {
             for (ConfigurationItemDict::const_iterator item = itemsToRemove.begin();
@@ -536,9 +536,9 @@ void ConfigurationServiceServant::removeConfigurationItems(
             }
         }
  
-        void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr& group)
+        void visitRTPGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMEDIA::V1::RTPGeneralGroupPtr& group)
         {
-            RtpGeneralGroupPtr g = mImpl->getGeneralGroup();
+            RTPGeneralGroupPtr g = mImpl->getGeneralGroup();
             if (g)
             {
                 removeItems(0, group->configurationItems, g->configurationItems);
@@ -554,7 +554,7 @@ void ConfigurationServiceServant::removeConfigurationItems(
             // we'll leave it here for now to avoid inconsistencies with the
             // rest of the configuration implementation.
             //
-            class Visitor : public RtpConfigurationItemVisitor
+            class Visitor : public RTPConfigurationItemVisitor
             {
             public:
                 Visitor(const ConfigurationServiceServantPtr& impl) :
@@ -648,7 +648,7 @@ void ConfigurationServiceServant::removeConfigurationItems(
             
             if (g)
             {
-                RtpConfigurationItemVisitorPtr v(new Visitor(mImpl));
+                RTPConfigurationItemVisitorPtr v(new Visitor(mImpl));
                 removeItems(v, group->configurationItems, g->configurationItems);
             }
         }
@@ -657,7 +657,7 @@ void ConfigurationServiceServant::removeConfigurationItems(
         ConfigurationServiceServantPtr mImpl;
     };
     
-    RtpConfigurationGroupVisitorPtr v = new GroupVisitor(this);
+    RTPConfigurationGroupVisitorPtr v = new GroupVisitor(this);
     boost::unique_lock<boost::shared_mutex> lock(mLock);
     
     for (ConfigurationGroupSeq::const_iterator group = groups.begin(); group != groups.end(); ++group)
@@ -668,7 +668,7 @@ void ConfigurationServiceServant::removeConfigurationItems(
 
 void ConfigurationServiceServant::removeConfigurationGroups(const ConfigurationGroupSeq& groups, const Ice::Current&)
 {
-    class GroupVisitor : public RtpConfigurationGroupVisitor
+    class GroupVisitor : public RTPConfigurationGroupVisitor
     {
     public:
         GroupVisitor(const ConfigurationServiceServantPtr& impl) : 
@@ -677,9 +677,9 @@ void ConfigurationServiceServant::removeConfigurationGroups(const ConfigurationG
         }
  
     private:
-        void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr&)
+        void visitRTPGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMEDIA::V1::RTPGeneralGroupPtr&)
         {
-            mImpl->replaceGroup(RtpGeneralGroupPtr());
+            mImpl->replaceGroup(RTPGeneralGroupPtr());
         }
 
         void visitICEConfigurationGroup(const RTPICEConfigurationGroupPtr&)
@@ -690,7 +690,7 @@ void ConfigurationServiceServant::removeConfigurationGroups(const ConfigurationG
         ConfigurationServiceServantPtr mImpl;
     };
     
-    RtpConfigurationGroupVisitorPtr v = new GroupVisitor(this);
+    RTPConfigurationGroupVisitorPtr v = new GroupVisitor(this);
 
     boost::unique_lock<boost::shared_mutex> lock(mLock);
     
diff --git a/src/RTPConfiguration.h b/src/RTPConfiguration.h
index fcc6e68..267f681 100644
--- a/src/RTPConfiguration.h
+++ b/src/RTPConfiguration.h
@@ -26,7 +26,7 @@
 #include "Configuration.h"
 
 class ConfigurationServiceImpl : virtual public AsteriskSCF::System::Configuration::V1::ConfigurationService,
-                                 virtual public AsteriskSCF::PJMediaRTP::RTPConfiguration
+                                 virtual public AsteriskSCF::PJMEDIARTP::RTPConfiguration
 {
 public:
     virtual AsteriskSCF::System::Configuration::V1::ConfigurationServicePrx
diff --git a/src/RtpReplicationContext.h b/src/RTPReplicationContext.h
similarity index 86%
rename from src/RtpReplicationContext.h
rename to src/RTPReplicationContext.h
index 8153465..3404161 100644
--- a/src/RtpReplicationContext.h
+++ b/src/RTPReplicationContext.h
@@ -21,17 +21,17 @@
 #include <AsteriskSCF/Replication/ReplicationContext.h>
 #include <AsteriskSCF/Component/TestContext.h>
 
-#include "RtpStateReplicationIf.h"
+#include "RTPStateReplicationIf.h"
 
-typedef AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicatorPrx> ReplicatorSmartPrx;
+typedef AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Replication::MediaRTPPJMEDIA::V1::RTPStateReplicatorPrx> ReplicatorSmartPrx;
 
 /** 
  * This class provides the component's classes with the context needed to perform replication. 
  */
-class RtpReplicationContext : public AsteriskSCF::Replication::ReplicationContext
+class RTPReplicationContext : public AsteriskSCF::Replication::ReplicationContext
 {
 public:
-    RtpReplicationContext(AsteriskSCF::Replication::ReplicationStateType state) : 
+    RTPReplicationContext(AsteriskSCF::Replication::ReplicationStateType state) : 
         AsteriskSCF::Replication::ReplicationContext(state)
     {
     }
@@ -73,6 +73,6 @@ public:
 private:
     ReplicatorSmartPrx mReplicator;
 };
-typedef boost::shared_ptr<RtpReplicationContext> RtpReplicationContextPtr;
+typedef boost::shared_ptr<RTPReplicationContext> RTPReplicationContextPtr;
 
 
diff --git a/src/RTPSession.cpp b/src/RTPSession.cpp
index 50416e8..4cccbb1 100644
--- a/src/RTPSession.cpp
+++ b/src/RTPSession.cpp
@@ -15,12 +15,12 @@
  */
 
 #include "RTPSession.h"
-#include "RtpStateReplicationIf.h"
+#include "RTPStateReplicationIf.h"
 #include "RTPSource.h"
 #include "RTPSink.h"
 #include "RTPConfiguration.h"
-#include "PJMediaTransport.h"
-#include "PJMediaEndpoint.h"
+#include "PJMEDIATransport.h"
+#include "PJMEDIAEndpoint.h"
 #include "UDPTransport.h"
 #include "ICETransport.h"
 #include "SRTPTransport.h"
@@ -42,10 +42,10 @@ using namespace AsteriskSCF::Core::Discovery::V1;
 using namespace AsteriskSCF::Media::V1;
 using namespace AsteriskSCF::Media::RTP::V1;
 using namespace AsteriskSCF::Media;
-using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
+using namespace AsteriskSCF::Replication::MediaRTPPJMEDIA::V1;
 using namespace AsteriskSCF::System::Component::V1;
 using namespace AsteriskSCF::Discovery;
-using namespace AsteriskSCF::PJMediaRTP;
+using namespace AsteriskSCF::PJMEDIARTP;
 using namespace AsteriskSCF::SessionCommunications::V1;
 
 /**
@@ -144,19 +144,19 @@ class RTPSessionImpl : public AsteriskSCF::Media::RTP::V1::SRTPSession
 public:
     RTPSessionImpl(const Ice::ObjectAdapterPtr&, 
             const string& id,
-            const PJMediaEnvironmentPtr& env,
+            const PJMEDIAEnvironmentPtr& env,
             const AsteriskSCF::Media::RTP::V1::RTPServiceLocatorParamsPtr& params,
-	        const RtpReplicationContextPtr& replicationContext,
+	        const RTPReplicationContextPtr& replicationContext,
 	        const ConfigurationServiceImplPtr&);
     
     RTPSessionImpl(const Ice::ObjectAdapterPtr& adapter,
             const string& sessionIdentity,    
-            const PJMediaEnvironmentPtr& env,
+            const PJMEDIAEnvironmentPtr& env,
             Ice::Int port,
             const AsteriskSCF::Media::V1::FormatSeq& formats,
             bool isIPv6,
             bool srtp,
-	        const RtpReplicationContextPtr& replicationContext,
+	        const RTPReplicationContextPtr& replicationContext,
             const ConfigurationServiceImplPtr& configurationServant);
 
     ~RTPSessionImpl();
@@ -201,18 +201,18 @@ public:
     StreamSinkRTPImplPtr getSinkServant();
     RTPTelephonyEventSourcePtr getTelephonyEventSourceServant();
     RTPTelephonyEventSinkPtr getTelephonyEventSinkServant();
-    PJMediaTransportPtr getTransport();
+    PJMEDIATransportPtr getTransport();
 
 
     void replicateState(
-            const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpSessionStateItemPtr&,
-            const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSinkStateItemPtr&,
-            const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSourceStateItemPtr&,
-            const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RTPTelephonyEventSinkStateItemPtr&,
-            const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RTPTelephonyEventSourceStateItemPtr&);
-    void removeState(const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpSessionStateItemPtr&,
-            const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSinkStateItemPtr&,
-            const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSourceStateItemPtr&);
+            const AsteriskSCF::Replication::MediaRTPPJMEDIA::V1::RTPSessionStateItemPtr&,
+            const AsteriskSCF::Replication::MediaRTPPJMEDIA::V1::RTPStreamSinkStateItemPtr&,
+            const AsteriskSCF::Replication::MediaRTPPJMEDIA::V1::RTPStreamSourceStateItemPtr&,
+            const AsteriskSCF::Replication::MediaRTPPJMEDIA::V1::RTPTelephonyEventSinkStateItemPtr&,
+            const AsteriskSCF::Replication::MediaRTPPJMEDIA::V1::RTPTelephonyEventSourceStateItemPtr&);
+    void removeState(const AsteriskSCF::Replication::MediaRTPPJMEDIA::V1::RTPSessionStateItemPtr&,
+            const AsteriskSCF::Replication::MediaRTPPJMEDIA::V1::RTPStreamSinkStateItemPtr&,
+            const AsteriskSCF::Replication::MediaRTPPJMEDIA::V1::RTPStreamSourceStateItemPtr&);
 
     void associatePayloadsImpl(const AsteriskSCF::Media::RTP::V1::PayloadMap& payloadMap);
     void setRemoteRtcpDetails(const std::string&, Ice::Int);
@@ -250,12 +250,12 @@ private:
     /**
      * The current pjmedia related environment.
      */
-    PJMediaEnvironmentPtr mEnvironment;
+    PJMEDIAEnvironmentPtr mEnvironment;
 
     /**
      * pjmedia endpoint for our media.
      */
-    PJMediaEndpointPtr mEndpoint;
+    PJMEDIAEndpointPtr mEndpoint;
 
     /**
      * Id.
@@ -276,7 +276,7 @@ private:
     /**
      * pjmedia transport for transmission/reception of RTP.
      */
-    PJMediaTransportPtr mTransport;
+    PJMEDIATransportPtr mTransport;
 
     /**
      * A stream source for this RTP session.
@@ -306,10 +306,10 @@ private:
     /**
      * Session state item.
      */
-    RtpSessionStateItemPtr mSessionStateItem;
+    RTPSessionStateItemPtr mSessionStateItem;
 
     // Context for state replication for this component. 
-    RtpReplicationContextPtr mReplicationContext;
+    RTPReplicationContextPtr mReplicationContext;
 
     /**
      * RTCP session for this RTP session.
@@ -389,12 +389,12 @@ public:
     {
     }
 
-    void replicateState(const RtpStreamSinkStateItemPtr& sinkStateItem) 
+    void replicateState(const RTPStreamSinkStateItemPtr& sinkStateItem) 
     {
         mServant->replicateState(0, sinkStateItem, 0, 0, 0);
     }
 
-    void replicateState(const RtpStreamSourceStateItemPtr& sourceStateItem)
+    void replicateState(const RTPStreamSourceStateItemPtr& sourceStateItem)
     {
         mServant->replicateState(0, 0, sourceStateItem, 0, 0);
     }
@@ -463,16 +463,16 @@ private:
  */
 RTPSessionImpl::RTPSessionImpl(const Ice::ObjectAdapterPtr& adapter,
         const string& id,
-        const PJMediaEnvironmentPtr& env,
+        const PJMEDIAEnvironmentPtr& env,
         const RTPServiceLocatorParamsPtr& params,
-	    const RtpReplicationContextPtr& replicationContext,
+	    const RTPReplicationContextPtr& replicationContext,
         const ConfigurationServiceImplPtr& configurationService) : 
     mEnvironment(env),
-    mEndpoint(PJMediaEndpoint::create(env)),
+    mEndpoint(PJMEDIAEndpoint::create(env)),
     mId(id),
     mAdapter(adapter),
     mFormats(params->formats),
-    mSessionStateItem(new RtpSessionStateItem),
+    mSessionStateItem(new RTPSessionStateItem),
     mReplicationContext(replicationContext)
 {
     RTPOverICEServiceLocatorParamsPtr iceParams(RTPOverICEServiceLocatorParamsPtr::dynamicCast(params));
@@ -519,15 +519,15 @@ RTPSessionImpl::RTPSessionImpl(const Ice::ObjectAdapterPtr& adapter,
  */
 RTPSessionImpl::RTPSessionImpl(const Ice::ObjectAdapterPtr& adapter,
         const string& sessionIdentity,
-        const PJMediaEnvironmentPtr& env,
+        const PJMEDIAEnvironmentPtr& env,
         Ice::Int port,
         const FormatSeq& formats,
         bool ipv6,
         bool srtp,
-	const RtpReplicationContextPtr& replicationContext,
+	const RTPReplicationContextPtr& replicationContext,
         const ConfigurationServiceImplPtr& configurationService) :
     mEnvironment(env),
-    mEndpoint(PJMediaEndpoint::create(env)),
+    mEndpoint(PJMEDIAEndpoint::create(env)),
     mId(sessionIdentity),
     mAdapter(adapter),
     mFormats(formats),
@@ -864,7 +864,7 @@ StreamSinkRTPImplPtr RTPSessionImpl::getSinkServant()
     return mStreamSink;
 }
 
-PJMediaTransportPtr RTPSessionImpl::getTransport()
+PJMEDIATransportPtr RTPSessionImpl::getTransport()
 {
     return mTransport;
 }
@@ -883,9 +883,9 @@ RTPTelephonyEventSinkPtr RTPSessionImpl::getTelephonyEventSinkServant()
  * API call which replicates state items.
  */
 void RTPSessionImpl::replicateState(
-        const RtpSessionStateItemPtr& session,
-        const RtpStreamSinkStateItemPtr& sink,
-        const RtpStreamSourceStateItemPtr& source,
+        const RTPSessionStateItemPtr& session,
+        const RTPStreamSinkStateItemPtr& sink,
+        const RTPStreamSourceStateItemPtr& source,
         const RTPTelephonyEventSinkStateItemPtr& telephonyEventSink,
         const RTPTelephonyEventSourceStateItemPtr& telephonyEventSource)
 {
@@ -895,7 +895,7 @@ void RTPSessionImpl::replicateState(
         return;
     }
 
-    RtpStateItemSeq items;
+    RTPStateItemSeq items;
 
     if (session)
     {
@@ -933,8 +933,8 @@ void RTPSessionImpl::replicateState(
 /**
  * API call which removes state items from the replicator.
  */
-void RTPSessionImpl::removeState(const RtpSessionStateItemPtr& session, const RtpStreamSinkStateItemPtr& sink,
-        const RtpStreamSourceStateItemPtr& source)
... 1751 lines suppressed ...


-- 
asterisk-scf/integration/media_rtp_pjmedia.git



More information about the asterisk-scf-commits mailing list