Merge lp:~morphis/aethercast/cleanup-things into lp:aethercast

[Simon Fels]

Cleanup various things

* use ac prefix rather than mcs
* move dbus things into specific subfolder
* adjust logger and include statements

[lp:~morphis/aethercast/cleanup-things]

149. By Simon Fels on 2016-05-31

Merge branch 'trunk'

150. By Simon Fels on 2016-05-31

Merge trunk

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Looks good, just two comments:

1.- Use of trace macros seems inconsistent. I see ERROR, DEBUG, and then AC_INFO. Please use one convention in a consistent way. Even more, I would prefer to remove duplicate macros in Logger class.

2.- I still see some instances of 'mcs':

src/ac/config.h.in
18:#ifndef MCS_CONFIG_H_
19:#define MCS_CONFIG_H_

src/ac/report/lttng/senderreport.cpp
29: mcs_tracepoint(aethercast_sender, sent_packet, timestamp, size);

src/ac/report/lttng/encoderreport.cpp
29: mcs_tracepoint(aethercast_encoder, started, 0);
33: mcs_tracepoint(aethercast_encoder, stopped, 0);
37: mcs_tracepoint(aethercast_encoder, began_frame, timestamp);
41: mcs_tracepoint(aethercast_encoder, finished_frame, timestamp);
45: mcs_tracepoint(aethercast_encoder, received_input_buffer, timestamp);

src/ac/report/lttng/utils.h
30:#define mcs_tracepoint(c, ...) tracepoint(c, __VA_ARGS__)

src/ac/report/lttng/packetizerreport.cpp
29: mcs_tracepoint(aethercast_packetizer, packetized_frame, timestamp);

src/ac/report/lttng/rendererreport.cpp
29: mcs_tracepoint(aethercast_renderer, began_frame, 0);
33: mcs_tracepoint(aethercast_renderer, finished_frame, timestamp);

src/ac/video/utils.cpp
39:} // mcs

src/ac/video/utils.h
31:} // mcs

src/ac/logger.h
103:// Log returns the mcs-wide configured logger instance.
106:// SetLog installs the given logger as mcs-wide default logger.

tests/CMakeLists.txt
13: ${CMAKE_SOURCE_DIR}/src/mcs

src/gdbus/CMakeLists.txt
3:file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mcs)

tests/ac/CMakeLists.txt
9: ${CMAKE_SOURCE_DIR}/src/mcs
10: ${CMAKE_SOURCE_DIR}/src/mcs/w11t/gdhcp

tests/ac/integration_tests/config.h.in
18:#ifndef MCS_TESTS_INTEGRATION_CONFIG_H_
19:#define MCS_TESTS_INTEGRATION_CONFIG_H_
27:} // namespace mcs

tests/common/dbusfixture.cpp
100: config_path += "/mcs-dbus-system-";

review: Needs Fixing

[Simon Fels (morphis)]

Thanks for spotting the missing conversions from mcs to ac. Fixed all of those.

INFO and AC_INFO both exists to avoid namespace clashes. Fixed the incorrect AC_INFO being used in src/ac/mir/screencast.cpp

[lp:~morphis/aethercast/cleanup-things]

151. By Simon Fels on 2016-06-01

Fix review comments

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Thanks for the changes.

It should be possible to use AC_TRACE, AC_DEBUG, etc. macros everywhere without collisions. So I do not think that is a reason strong enough to have two types of macros. Somebody approaching this code for the first time will wonder why there are two types of print macros and if they behave in a different way. I would really prefer having just one type unless there is a strong reason for this, and I think this refactoring is the right moment to do so.

review: Needs Information

[lp:~morphis/aethercast/cleanup-things]

152. By Simon Fels on 2016-06-07

Use AC_* log method everywhere

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Looks great

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-04-27 07:37:30 +0000
+++ src/CMakeLists.txt	2016-06-07 08:21:39 +0000
@@ -7,115 +7,116 @@
 set(DHCP_SERVER_PATH "/usr/sbin/dhcpd")
 set(DHCP_CLIENT_PATH "/sbin/dhclient")
 
-configure_file(mcs/config.h.in mcs/config.h @ONLY)
+configure_file(ac/config.h.in ac/config.h @ONLY)
 configure_file(w11tng/config.h.in w11tng/config.h @ONLY)
 
 set(HEADERS
-  mcs/glib_wrapper.h
-
-  mcs/ip_v4_address.h
-  mcs/keep_alive.h
-  mcs/mac_address.h
-  mcs/shared_gobject.h
-  mcs/keep_alive.h
-  mcs/config.h
-
-  mcs/common/executable.h
-  mcs/common/executor.h
-  mcs/common/executorfactory.h
-
-  mcs/network/types.h
-
-  mcs/report/lttng/utils.h
-  mcs/report/lttng/encoderreport_tp.h
-  mcs/report/lttng/rendererreport_tp.h
-  mcs/report/lttng/packetizerreport_tp.h
-  mcs/report/lttng/senderreport_tp.h
-
-  mcs/video/encoderreport.h
-  mcs/video/rendererreport.h
-  mcs/video/packetizerreport.h
-  mcs/video/senderreport.h
-  mcs/video/bufferproducer.h
-
-  mcs/streaming/packetizer.h
+  ac/glib_wrapper.h
+
+  ac/ip_v4_address.h
+  ac/keep_alive.h
+  ac/mac_address.h
+  ac/shared_gobject.h
+  ac/keep_alive.h
+  ac/config.h
+
+  ac/common/executable.h
+  ac/common/executor.h
+  ac/common/executorfactory.h
+
+  ac/network/types.h
+
+  ac/report/lttng/utils.h
+  ac/report/lttng/encoderreport_tp.h
+  ac/report/lttng/rendererreport_tp.h
+  ac/report/lttng/packetizerreport_tp.h
+  ac/report/lttng/senderreport_tp.h
+
+  ac/video/encoderreport.h
+  ac/video/rendererreport.h
+  ac/video/packetizerreport.h
+  ac/video/senderreport.h
+  ac/video/bufferproducer.h
+
+  ac/streaming/packetizer.h
 
   w11tng/config.h
 )
 
 set(SOURCES
-  mcs/types.cpp
-  mcs/utils.cpp
-  mcs/networkutils.cpp
-  mcs/mediamanagerfactory.cpp
-  mcs/basesourcemediamanager.cpp
-  mcs/logger.cpp
-  mcs/forwardingmiracastcontroller.cpp
-  mcs/forwardingnetworkdevice.cpp
-  mcs/miracastcontroller.cpp
-  mcs/miracastcontrollerskeleton.cpp
-  mcs/miracastservice.cpp
-  mcs/miracastsourcemanager.cpp
-  mcs/miracastsourceclient.cpp
-  mcs/networkmanager.cpp
-  mcs/networkmanagerfactory.cpp
-  mcs/networkdevice.cpp
-  mcs/dbushelpers.cpp
-  mcs/networkdeviceskeleton.cpp
-  mcs/dbuserrors.cpp
-
-  mcs/common/executorpool.cpp
-  mcs/common/threadedexecutor.cpp
-  mcs/common/threadedexecutorfactory.cpp
-
-  mcs/network/stream.cpp
-  mcs/network/udpstream.cpp
-
-  mcs/report/reportfactory.cpp
-  mcs/report/reportfactory.h
-
-  mcs/report/null/nullreportfactory.cpp
-  mcs/report/null/encoderreport.cpp
-  mcs/report/null/rendererreport.cpp
-  mcs/report/null/packetizerreport.cpp
-  mcs/report/null/senderreport.cpp
-  mcs/report/logging/loggingreportfactory.cpp
-  mcs/report/logging/encoderreport.cpp
-  mcs/report/logging/rendererreport.cpp
-  mcs/report/logging/packetizerreport.cpp
-  mcs/report/logging/senderreport.cpp
-  mcs/report/lttng/lttngreportfactory.cpp
-  mcs/report/lttng/tracepointprovider.cpp
-  mcs/report/lttng/encoderreport.cpp
-  mcs/report/lttng/rendererreport.cpp
-  mcs/report/lttng/packetizerreport.cpp
-  mcs/report/lttng/senderreport.cpp
-
-  mcs/video/videoformat.cpp
-  mcs/video/buffer.cpp
-  mcs/video/bufferqueue.cpp
-  mcs/video/utils.cpp
-  mcs/video/utils_from_android.cpp
-  mcs/video/baseencoder.cpp
-  mcs/video/h264analyzer.cpp
-  mcs/video/displayoutput.cpp
-
-  mcs/streaming/transportsender.cpp
-  mcs/streaming/mpegtspacketizer.cpp
-  mcs/streaming/rtpsender.cpp
-  mcs/streaming/mediasender.cpp
-
-  mcs/mir/sourcemediamanager.cpp
-  mcs/mir/screencast.cpp
-  mcs/mir/streamrenderer.cpp
-
-  mcs/android/h264encoder.cpp
-
-  mcs/systemcontroller.cpp
-
-  mcs/ubuntu/unity.cpp
-  mcs/ubuntu/systemcontroller.cpp
-  mcs/ubuntu/unitydisplaylock.cpp
+  ac/types.cpp
+  ac/utils.cpp
+  ac/networkutils.cpp
+  ac/mediamanagerfactory.cpp
+  ac/basesourcemediamanager.cpp
+  ac/logger.cpp
+  ac/forwardingcontroller.cpp
+  ac/forwardingnetworkdevice.cpp
+  ac/controller.cpp
+  ac/service.cpp
+  ac/sourcemanager.cpp
+  ac/sourceclient.cpp
+  ac/networkmanager.cpp
+  ac/networkmanagerfactory.cpp
+  ac/networkdevice.cpp
+
+  ac/dbus/helpers.cpp
+  ac/dbus/errors.cpp
+  ac/dbus/controllerskeleton.cpp
+  ac/dbus/networkdeviceskeleton.cpp
+
+  ac/common/executorpool.cpp
+  ac/common/threadedexecutor.cpp
+  ac/common/threadedexecutorfactory.cpp
+
+  ac/network/stream.cpp
+  ac/network/udpstream.cpp
+
+  ac/report/reportfactory.cpp
+  ac/report/reportfactory.h
+
+  ac/report/null/nullreportfactory.cpp
+  ac/report/null/encoderreport.cpp
+  ac/report/null/rendererreport.cpp
+  ac/report/null/packetizerreport.cpp
+  ac/report/null/senderreport.cpp
+  ac/report/logging/loggingreportfactory.cpp
+  ac/report/logging/encoderreport.cpp
+  ac/report/logging/rendererreport.cpp
+  ac/report/logging/packetizerreport.cpp
+  ac/report/logging/senderreport.cpp
+  ac/report/lttng/lttngreportfactory.cpp
+  ac/report/lttng/tracepointprovider.cpp
+  ac/report/lttng/encoderreport.cpp
+  ac/report/lttng/rendererreport.cpp
+  ac/report/lttng/packetizerreport.cpp
+  ac/report/lttng/senderreport.cpp
+
+  ac/video/videoformat.cpp
+  ac/video/buffer.cpp
+  ac/video/bufferqueue.cpp
+  ac/video/utils.cpp
+  ac/video/utils_from_android.cpp
+  ac/video/baseencoder.cpp
+  ac/video/h264analyzer.cpp
+  ac/video/displayoutput.cpp
+
+  ac/streaming/transportsender.cpp
+  ac/streaming/mpegtspacketizer.cpp
+  ac/streaming/rtpsender.cpp
+  ac/streaming/mediasender.cpp
+
+  ac/mir/sourcemediamanager.cpp
+  ac/mir/screencast.cpp
+  ac/mir/streamrenderer.cpp
+
+  ac/android/h264encoder.cpp
+
+  ac/systemcontroller.cpp
+
+  ac/ubuntu/unity.cpp
+  ac/ubuntu/systemcontroller.cpp
+  ac/ubuntu/unitydisplaylock.cpp
 
   w11tng/networkmanager.cpp
   w11tng/rfkillmanager.cpp
@@ -178,7 +179,7 @@
   -ldl
 )
 
-add_library(aethercast-lttng SHARED mcs/report/lttng/tracepoints.c)
+add_library(aethercast-lttng SHARED ac/report/lttng/tracepoints.c)
 target_link_libraries(aethercast-lttng
     ${LTTNG_UST_LIBRARIES}
 )
@@ -187,7 +188,7 @@
   LIBRARY DESTINATION ${AETHERCAST_TRACEPOINT_LIB_INSTALL_DIR}
 )
 
-add_executable(aethercast mcs/main.cpp)
+add_executable(aethercast ac/main.cpp)
 target_link_libraries(aethercast aethercast-core)
 
 install(

=== added directory 'src/ac'
=== added directory 'src/ac/android'
=== renamed file 'src/mcs/android/h264encoder.cpp' => 'src/ac/android/h264encoder.cpp'
--- src/mcs/android/h264encoder.cpp	2016-04-22 12:58:47 +0000
+++ src/ac/android/h264encoder.cpp	2016-06-07 08:21:39 +0000
@@ -25,10 +25,10 @@
 
 #include <boost/concept_check.hpp>
 
-#include "mcs/logger.h"
-#include "mcs/keep_alive.h"
+#include "ac/logger.h"
+#include "ac/keep_alive.h"
 
-#include "mcs/android/h264encoder.h"
+#include "ac/android/h264encoder.h"
 
 namespace {
 static constexpr const char *kEncoderThreadName{"H264Encoder"};
@@ -78,7 +78,7 @@
 static constexpr const char *kFormatKeyPrependSpsPpstoIdrFrames{"prepend-sps-pps-to-idr-frames"};
 }
 
-namespace mcs {
+namespace ac {
 namespace android {
 
 class MediaSourceBuffer : public video::Buffer
@@ -157,7 +157,7 @@
     source_format_(nullptr),
     encoder_(nullptr),
     running_(false),
-    input_queue_(mcs::video::BufferQueue::Create()),
+    input_queue_(ac::video::BufferQueue::Create()),
     start_time_(-1ll),
     frame_count_(0) {
 }
@@ -179,7 +179,7 @@
     if (encoder_)
         return false;
 
-    MCS_DEBUG("configuring with %dx%d@%d", config.width, config.height, config.framerate);
+    AC_DEBUG("configuring with %dx%d@%d", config.width, config.height, config.framerate);
 
     auto format = media_message_create();
     if (!format)
@@ -229,14 +229,14 @@
 
     auto source = media_source_create();
     if (!source) {
-        MCS_ERROR("Failed to create media input source for encoder");
+        AC_ERROR("Failed to create media input source for encoder");
         media_message_release(format);
         return false;
     }
 
     auto source_format = media_meta_data_create();
     if (!source_format) {
-        MCS_ERROR("Failed to create media meta data for encoder source");
+        AC_ERROR("Failed to create media meta data for encoder source");
         media_message_release(format);
         media_source_release(source);
         return false;
@@ -282,7 +282,7 @@
     // needed.
     encoder_ = media_codec_source_create(format, source, 0);
     if (!encoder_) {
-        MCS_ERROR("Failed to create encoder instance");
+        AC_ERROR("Failed to create encoder instance");
         media_meta_data_release(source_format);
         media_message_release(format);
         media_source_release(source);
@@ -293,7 +293,7 @@
     format_ = format;
     source_format_ = source_format;
 
-    MCS_DEBUG("Configured encoder succesfully");
+    AC_DEBUG("Configured encoder succesfully");
 
     return true;
 }
@@ -308,7 +308,7 @@
     running_ = true;
 
     if (!media_codec_source_start(encoder_)) {
-        MCS_ERROR("Failed to start encoder");
+        AC_ERROR("Failed to start encoder");
         running_ = false;
         return false;
     }
@@ -322,7 +322,7 @@
     boost::ignore_unused_variable_warning(meta);
     boost::ignore_unused_variable_warning(user_data);
 
-    MCS_DEBUG("");
+    AC_DEBUG("");
 
     return 0;
 }
@@ -330,7 +330,7 @@
 int H264Encoder::OnSourceStop(void *user_data) {
     boost::ignore_unused_variable_warning(user_data);
 
-    MCS_DEBUG("");
+    AC_DEBUG("");
 
     return 0;
 }
@@ -338,14 +338,14 @@
 int H264Encoder::OnSourcePause(void *user_data) {
     boost::ignore_unused_variable_warning(user_data);
 
-    MCS_DEBUG("");
+    AC_DEBUG("");
 
     return 0;
 }
 
-MediaBufferWrapper* H264Encoder::PackBuffer(const mcs::video::Buffer::Ptr &input_buffer, const mcs::TimestampUs &timestamp) {
+MediaBufferWrapper* H264Encoder::PackBuffer(const ac::video::Buffer::Ptr &input_buffer, const ac::TimestampUs &timestamp) {
     if (!input_buffer->NativeHandle()) {
-        MCS_WARNING("Ignoring buffer without native handle");
+        AC_WARNING("Ignoring buffer without native handle");
         return nullptr;
     }
 
@@ -424,7 +424,7 @@
     }
 
     if (iter == thiz->pending_buffers_.end()) {
-        MCS_WARNING("Didn't remember returned buffer!?");
+        AC_WARNING("Didn't remember returned buffer!?");
         return;
     }
 
@@ -456,13 +456,13 @@
 
 bool H264Encoder::Execute() {
     if (!running_) {
-        MCS_ERROR("Tried to execute encoder while not started");
+        AC_ERROR("Tried to execute encoder while not started");
         return false;
     }
 
     MediaBufferWrapper *buffer = nullptr;
     if (!media_codec_source_read(encoder_, &buffer)) {
-        MCS_ERROR("Failed to read a new buffer from encoder");
+        AC_ERROR("Failed to read a new buffer from encoder");
         return false;
     }
 
@@ -512,7 +512,7 @@
     if (!encoder_)
         return;
 
-    MCS_DEBUG("");
+    AC_DEBUG("");
 
     media_codec_source_request_idr_frame(encoder_);
 }
@@ -522,4 +522,4 @@
 }
 
 } // namespace android
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/android/h264encoder.h' => 'src/ac/android/h264encoder.h'
--- src/mcs/android/h264encoder.h	2016-04-22 12:58:11 +0000
+++ src/ac/android/h264encoder.h	2016-06-07 08:21:39 +0000
@@ -15,24 +15,24 @@
  *
  */
 
-#ifndef MCS_ANDORID_ENCODER_H_
-#define MCS_ANDORID_ENCODER_H_
+#ifndef AC_ANDORID_ENCODER_H_
+#define AC_ANDORID_ENCODER_H_
 
 #include <memory>
 #include <thread>
 
 #include <hybris/media/media_codec_source_layer.h>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/common/executable.h"
-
-#include "mcs/video/baseencoder.h"
-#include "mcs/video/encoderreport.h"
-#include "mcs/video/bufferqueue.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/common/executable.h"
+
+#include "ac/video/baseencoder.h"
+#include "ac/video/encoderreport.h"
+#include "ac/video/bufferqueue.h"
+
+namespace ac {
 namespace android {
 
 class H264Encoder : public video::BaseEncoder {
@@ -47,14 +47,14 @@
 
     bool Configure(const BaseEncoder::Config &config) override;
 
-    void QueueBuffer(const mcs::video::Buffer::Ptr &buffer) override;
+    void QueueBuffer(const ac::video::Buffer::Ptr &buffer) override;
 
     bool Running() const override { return running_; }
     BaseEncoder::Config Configuration() const override;
 
     void SendIDRFrame() override;
 
-    // From mcs::common::Executable
+    // From ac::common::Executable
     bool Start() override;
     bool Stop() override;
     bool Execute() override;
@@ -65,7 +65,7 @@
 
     bool DoesBufferContainCodecConfig(MediaBufferWrapper *buffer);
 
-    MediaBufferWrapper* PackBuffer(const mcs::video::Buffer::Ptr &input_buffer, const mcs::TimestampUs &timestamp);
+    MediaBufferWrapper* PackBuffer(const ac::video::Buffer::Ptr &input_buffer, const ac::TimestampUs &timestamp);
 
 private:
     static int OnSourceRead(MediaBufferWrapper **buffer, void *user_data);
@@ -77,7 +77,7 @@
 
 private:
     struct BufferItem {
-        mcs::video::Buffer::Ptr buffer;
+        ac::video::Buffer::Ptr buffer;
         MediaBufferWrapper *media_buffer;
     };
 
@@ -88,13 +88,13 @@
     MediaMetaDataWrapper *source_format_;
     MediaCodecSourceWrapper *encoder_;
     bool running_;
-    mcs::video::BufferQueue::Ptr input_queue_;
+    ac::video::BufferQueue::Ptr input_queue_;
     std::vector<BufferItem> pending_buffers_;
-    mcs::TimestampUs start_time_;
+    ac::TimestampUs start_time_;
     uint32_t frame_count_;
 };
 
 } // namespace android
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/basesourcemediamanager.cpp' => 'src/ac/basesourcemediamanager.cpp'
--- src/mcs/basesourcemediamanager.cpp	2016-05-05 17:29:14 +0000
+++ src/ac/basesourcemediamanager.cpp	2016-06-07 08:21:39 +0000
@@ -17,15 +17,15 @@
 
 #include <iostream>
 
-#include "mcs/logger.h"
-#include "mcs/basesourcemediamanager.h"
-#include "mcs/video/videoformat.h"
+#include "ac/logger.h"
+#include "ac/basesourcemediamanager.h"
+#include "ac/video/videoformat.h"
 
 namespace {
 static unsigned int next_session_id = 0;
 }
 
-namespace mcs {
+namespace ac {
 BaseSourceMediaManager::BaseSourceMediaManager() :
     session_id_(++next_session_id) {
 }
@@ -80,9 +80,9 @@
         wds::H264VideoCodec codec1(wds::CBP, wds::k3_1, cea_rr, vesa_rr, hh_rr);
         codecs.push_back(codec1);
 
-        DEBUG("Video codecs supported by us:");
+        AC_DEBUG("Video codecs supported by us:");
         for (auto c : codecs)
-            mcs::video::DumpVideoCodec(c);
+            ac::video::DumpVideoCodec(c);
     }
 
     return codecs;
@@ -91,12 +91,12 @@
 bool BaseSourceMediaManager::InitOptimalVideoFormat(const wds::NativeVideoFormat& sink_native_format,
     const std::vector<wds::H264VideoCodec>& sink_supported_codecs) {
 
-    DEBUG("Sink native resolution:");
-    mcs::video::DumpNativeFormat(sink_native_format);
+    AC_DEBUG("Sink native resolution:");
+    ac::video::DumpNativeFormat(sink_native_format);
 
-    DEBUG("Sink supports the following codecs:");
+    AC_DEBUG("Sink supports the following codecs:");
     for (auto sink_codec : sink_supported_codecs) {
-        mcs::video::DumpVideoCodec(sink_codec);
+        ac::video::DumpVideoCodec(sink_codec);
     }
 
     bool success = false;
@@ -111,12 +111,12 @@
         format_.rate_resolution = wds::CEA1280x720p30;
 
     if (!success) {
-        MCS_ERROR("Failed to select proper video format");
+        AC_ERROR("Failed to select proper video format");
         return false;
     }
 
-    DEBUG("Found optimal video format:");
-    mcs::video::DumpVideoFormat(format_);
+    AC_DEBUG("Found optimal video format:");
+    ac::video::DumpVideoFormat(format_);
 
     return Configure();
 }
@@ -139,10 +139,10 @@
 }
 
 void BaseSourceMediaManager::SendIDRPicture() {
-    WARNING("Unimplemented IDR picture request");
+    AC_WARNING("Unimplemented IDR picture request");
 }
 
 std::string BaseSourceMediaManager::GetSessionId() const {
     return std::to_string(session_id_);
 }
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/basesourcemediamanager.h' => 'src/ac/basesourcemediamanager.h'
--- src/mcs/basesourcemediamanager.h	2016-05-05 17:29:14 +0000
+++ src/ac/basesourcemediamanager.h	2016-06-07 08:21:39 +0000
@@ -22,13 +22,13 @@
 
 #include <wds/media_manager.h>
 
-#include "mcs/non_copyable.h"
+#include "ac/non_copyable.h"
 
-namespace mcs {
+namespace ac {
 class BaseSourceMediaManager : public wds::SourceMediaManager
 {
 public:
-    class Delegate : public mcs::NonCopyable {
+    class Delegate : public ac::NonCopyable {
     public:
         virtual void OnSourceNetworkError() = 0;
     };
@@ -64,5 +64,5 @@
     wds::AudioCodec audio_codec_;
     unsigned int session_id_;
 };
-} // namespace mcs
+} // namespace ac
 #endif

=== added directory 'src/ac/common'
=== renamed file 'src/mcs/common/executable.h' => 'src/ac/common/executable.h'
--- src/mcs/common/executable.h	2016-03-14 11:09:02 +0000
+++ src/ac/common/executable.h	2016-06-07 08:21:39 +0000
@@ -15,18 +15,18 @@
  *
  */
 
-#ifndef MCS_COMMON_EXECUTABLE_H_
-#define MCS_COMMON_EXECUTABLE_H_
+#ifndef AC_COMMON_EXECUTABLE_H_
+#define AC_COMMON_EXECUTABLE_H_
 
 #include <memory>
 #include <string>
 
-#include "mcs/non_copyable.h"
+#include "ac/non_copyable.h"
 
-namespace mcs {
+namespace ac {
 namespace common {
 
-class Executable : public mcs::NonCopyable {
+class Executable : public ac::NonCopyable {
 public:
     typedef std::shared_ptr<Executable> Ptr;
 
@@ -44,6 +44,6 @@
 };
 
 } // namespace common
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/common/executor.h' => 'src/ac/common/executor.h'
--- src/mcs/common/executor.h	2016-03-07 11:05:18 +0000
+++ src/ac/common/executor.h	2016-06-07 08:21:39 +0000
@@ -15,17 +15,17 @@
  *
  */
 
-#ifndef MCS_COMMON_EXECUTOR_H_
-#define MCS_COMMON_EXECUTOR_H_
+#ifndef AC_COMMON_EXECUTOR_H_
+#define AC_COMMON_EXECUTOR_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
+#include "ac/non_copyable.h"
 
-namespace mcs {
+namespace ac {
 namespace common {
 
-class Executor : public mcs::NonCopyable {
+class Executor : public ac::NonCopyable {
 public:
     typedef std::shared_ptr<Executor> Ptr;
 
@@ -38,6 +38,6 @@
 };
 
 } // namespace common
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/common/executorfactory.h' => 'src/ac/common/executorfactory.h'
--- src/mcs/common/executorfactory.h	2016-03-14 11:09:02 +0000
+++ src/ac/common/executorfactory.h	2016-06-07 08:21:39 +0000
@@ -15,20 +15,20 @@
  *
  */
 
-#ifndef MCS_COMMON_EXECUTORFACTORY_H_
-#define MCS_COMMON_EXECUTORFACTORY_H_
+#ifndef AC_COMMON_EXECUTORFACTORY_H_
+#define AC_COMMON_EXECUTORFACTORY_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-
-#include "mcs/common/executable.h"
-#include "mcs/common/executor.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+
+#include "ac/common/executable.h"
+#include "ac/common/executor.h"
+
+namespace ac {
 namespace common {
 
-class ExecutorFactory : public mcs::NonCopyable {
+class ExecutorFactory : public ac::NonCopyable {
 public:
     typedef std::shared_ptr<ExecutorFactory> Ptr;
 
@@ -39,6 +39,6 @@
 };
 
 } // namespace common
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/common/executorpool.cpp' => 'src/ac/common/executorpool.cpp'
--- src/mcs/common/executorpool.cpp	2016-03-30 08:13:42 +0000
+++ src/ac/common/executorpool.cpp	2016-06-07 08:21:39 +0000
@@ -15,9 +15,9 @@
  *
  */
 
-#include "mcs/common/executorpool.h"
+#include "ac/common/executorpool.h"
 
-namespace mcs {
+namespace ac {
 namespace common {
 
 ExecutorPool::ExecutorPool(const ExecutorFactory::Ptr &factory, const size_t &size) :
@@ -84,4 +84,4 @@
 }
 
 } // namespace common
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/common/executorpool.h' => 'src/ac/common/executorpool.h'
--- src/mcs/common/executorpool.h	2016-03-30 08:13:42 +0000
+++ src/ac/common/executorpool.h	2016-06-07 08:21:39 +0000
@@ -15,24 +15,24 @@
  *
  */
 
-#ifndef MCS_COMMON_EXECUTORPOOL_H_
-#define MCS_COMMON_EXECUTORPOOL_H_
+#ifndef AC_COMMON_EXECUTORPOOL_H_
+#define AC_COMMON_EXECUTORPOOL_H_
 
 #include <cstddef>
 
 #include <vector>
 
-#include "mcs/non_copyable.h"
-
-#include "mcs/common/executor.h"
-#include "mcs/common/executorfactory.h"
-#include "mcs/common/executable.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+
+#include "ac/common/executor.h"
+#include "ac/common/executorfactory.h"
+#include "ac/common/executable.h"
+
+namespace ac {
 namespace common {
 
 
-class ExecutorPool : public mcs::NonCopyable {
+class ExecutorPool : public ac::NonCopyable {
 public:
     ExecutorPool(const ExecutorFactory::Ptr &factory, const size_t &size);
     ~ExecutorPool();
@@ -57,6 +57,6 @@
 };
 
 } // namespace common
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/common/threadedexecutor.cpp' => 'src/ac/common/threadedexecutor.cpp'
--- src/mcs/common/threadedexecutor.cpp	2016-03-14 11:09:02 +0000
+++ src/ac/common/threadedexecutor.cpp	2016-06-07 08:21:39 +0000
@@ -15,12 +15,12 @@
  *
  */
 
-#include "mcs/utils.h"
-#include "mcs/logger.h"
-
-#include "mcs/common/threadedexecutor.h"
-
-namespace mcs {
+#include "ac/utils.h"
+#include "ac/logger.h"
+
+#include "ac/common/threadedexecutor.h"
+
+namespace ac {
 namespace common {
 
 
@@ -35,8 +35,8 @@
 
 void ThreadedExecutor::ThreadWorker() {
     if (executable_->Name().length() > 0) {
-        mcs::Utils::SetThreadName(executable_->Name());
-        MCS_DEBUG("Started threaded executor %s", executable_->Name());
+        ac::Utils::SetThreadName(executable_->Name());
+        AC_DEBUG("Started threaded executor %s", executable_->Name());
     }
 
     while (running_) {
@@ -64,7 +64,7 @@
         return false;
 
     if (!executable_->Stop())
-        MCS_ERROR("Failed to stop exutable");
+        AC_ERROR("Failed to stop exutable");
 
     thread_.join();
 
@@ -76,4 +76,4 @@
 }
 
 } // namespace common
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/common/threadedexecutor.h' => 'src/ac/common/threadedexecutor.h'
--- src/mcs/common/threadedexecutor.h	2016-03-14 11:09:02 +0000
+++ src/ac/common/threadedexecutor.h	2016-06-07 08:21:39 +0000
@@ -15,17 +15,17 @@
  *
  */
 
-#ifndef MCS_COMMON_THREADEDEXECUTOR_H_
-#define MCS_COMMON_THREADEDEXECUTOR_H_
+#ifndef AC_COMMON_THREADEDEXECUTOR_H_
+#define AC_COMMON_THREADEDEXECUTOR_H_
 
 #include <atomic>
 #include <memory>
 #include <thread>
 
-#include "mcs/common/executor.h"
-#include "mcs/common/executable.h"
+#include "ac/common/executor.h"
+#include "ac/common/executable.h"
 
-namespace mcs {
+namespace ac {
 namespace common {
 
 class ThreadedExecutor : public Executor {
@@ -49,6 +49,6 @@
 };
 
 } // namespace common
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/common/threadedexecutorfactory.cpp' => 'src/ac/common/threadedexecutorfactory.cpp'
--- src/mcs/common/threadedexecutorfactory.cpp	2016-03-14 11:09:02 +0000
+++ src/ac/common/threadedexecutorfactory.cpp	2016-06-07 08:21:39 +0000
@@ -15,10 +15,10 @@
  *
  */
 
-#include "mcs/common/threadedexecutorfactory.h"
-#include "mcs/common/threadedexecutor.h"
+#include "ac/common/threadedexecutorfactory.h"
+#include "ac/common/threadedexecutor.h"
 
-namespace mcs {
+namespace ac {
 namespace common {
 
 Executor::Ptr ThreadedExecutorFactory::Create(const Executable::Ptr &executable) {
@@ -26,4 +26,4 @@
 }
 
 } // namespace common
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/common/threadedexecutorfactory.h' => 'src/ac/common/threadedexecutorfactory.h'
--- src/mcs/common/threadedexecutorfactory.h	2016-03-14 11:09:02 +0000
+++ src/ac/common/threadedexecutorfactory.h	2016-06-07 08:21:39 +0000
@@ -15,12 +15,12 @@
  *
  */
 
-#ifndef MCS_COMMON_THREADEDEXECUTORFACTORY_H_
-#define MCS_COMMON_THREADEDEXECUTORFACTORY_H_
-
-#include "mcs/common/executorfactory.h"
-
-namespace mcs {
+#ifndef AC_COMMON_THREADEDEXECUTORFACTORY_H_
+#define AC_COMMON_THREADEDEXECUTORFACTORY_H_
+
+#include "ac/common/executorfactory.h"
+
+namespace ac {
 namespace common {
 
 class ThreadedExecutorFactory : public ExecutorFactory {
@@ -29,6 +29,6 @@
 };
 
 } // namespace common
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/config.h.in' => 'src/ac/config.h.in'
--- src/mcs/config.h.in	2016-04-27 07:37:30 +0000
+++ src/ac/config.h.in	2016-06-07 08:21:39 +0000
@@ -15,10 +15,10 @@
  *
  */
 
-#ifndef MCS_CONFIG_H_
-#define MCS_CONFIG_H_
+#ifndef AC_CONFIG_H_
+#define AC_CONFIG_H_
 
-namespace mcs {
+namespace ac {
 // FIXME(morphis) Make both paths be configured from cmake with the
 // correct system defaults.
 constexpr const char* kRuntimePath{"/run/aethercast"};

=== added file 'src/ac/controller.cpp'
--- src/ac/controller.cpp	1970-01-01 00:00:00 +0000
+++ src/ac/controller.cpp	2016-06-07 08:21:39 +0000
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "controller.h"

=== renamed file 'src/mcs/miracastcontroller.h' => 'src/ac/controller.h'
--- src/mcs/miracastcontroller.h	2016-04-27 07:37:30 +0000
+++ src/ac/controller.h	2016-06-07 08:21:39 +0000
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef MIRACAST_CONTROLLER_H_
-#define MIRACAST_CONTROLLER_H_
+#ifndef AC_CONTROLLER_H_
+#define AC_CONTROLLER_H_
 
 #include <chrono>
 #include <memory>
@@ -26,13 +26,13 @@
 #include "non_copyable.h"
 #include "types.h"
 
-namespace mcs {
-class MiracastController : private mcs::NonCopyable
+namespace ac {
+class Controller : private ac::NonCopyable
 {
 public:
-    typedef std::shared_ptr<MiracastController> Ptr;
+    typedef std::shared_ptr<Controller> Ptr;
 
-    class Delegate : private mcs::NonCopyable {
+    class Delegate : private ac::NonCopyable {
     public:
         virtual ~Delegate() { }
 
@@ -54,7 +54,7 @@
 
     virtual void DisconnectAll(ResultCallback callback) = 0;
 
-    virtual mcs::Error Scan(const std::chrono::seconds &timeout = std::chrono::seconds{30}) = 0;
+    virtual ac::Error Scan(const std::chrono::seconds &timeout = std::chrono::seconds{30}) = 0;
 
     virtual NetworkDeviceState State() const = 0;
     virtual std::vector<NetworkManager::Capability> Capabilities() const = 0;
@@ -64,7 +64,7 @@
     virtual Error SetEnabled(bool enabled) = 0;
 
 protected:
-    MiracastController() = default;
+    Controller() = default;
 };
-} // namespace mcs
+} // namespace ac
 #endif

=== added directory 'src/ac/dbus'
=== renamed file 'src/mcs/miracastcontrollerskeleton.cpp' => 'src/ac/dbus/controllerskeleton.cpp'
--- src/mcs/miracastcontrollerskeleton.cpp	2016-04-27 07:37:30 +0000
+++ src/ac/dbus/controllerskeleton.cpp	2016-06-07 08:21:39 +0000
@@ -19,33 +19,35 @@
 
 #include <boost/concept_check.hpp>
 
-#include "mcs/glib_wrapper.h"
-
-#include "mcs/miracastcontrollerskeleton.h"
-#include "mcs/keep_alive.h"
-#include "mcs/utils.h"
-#include "mcs/dbushelpers.h"
-#include "mcs/logger.h"
-#include "mcs/dbuserrors.h"
+#include "ac/glib_wrapper.h"
+
+#include "ac/keep_alive.h"
+#include "ac/utils.h"
+#include "ac/logger.h"
+
+#include "ac/dbus/controllerskeleton.h"
+#include "ac/dbus/errors.h"
+#include "ac/dbus/helpers.h"
 
 namespace {
-constexpr const char *kManagerSkeletonInstanceKey{"miracast-controller-skeleton"};
-}
-
-namespace mcs {
-std::shared_ptr<MiracastControllerSkeleton> MiracastControllerSkeleton::create(const std::shared_ptr<MiracastController> &controller) {
-    return std::shared_ptr<MiracastControllerSkeleton>(new MiracastControllerSkeleton(controller))->FinalizeConstruction();
-}
-
-MiracastControllerSkeleton::MiracastControllerSkeleton(const std::shared_ptr<MiracastController> &controller) :
-    ForwardingMiracastController(controller),
+constexpr const char *kManagerSkeletonInstanceKey{"controller-skeleton"};
+}
+
+namespace ac {
+namespace dbus {
+std::shared_ptr<ControllerSkeleton> ControllerSkeleton::Create(const std::shared_ptr<Controller> &controller) {
+    return std::shared_ptr<ControllerSkeleton>(new ControllerSkeleton(controller))->FinalizeConstruction();
+}
+
+ControllerSkeleton::ControllerSkeleton(const std::shared_ptr<Controller> &controller) :
+    ForwardingController(controller),
     manager_obj_(nullptr),
     bus_connection_(nullptr),
     bus_id_(0),
     object_manager_(nullptr) {
 }
 
-MiracastControllerSkeleton::~MiracastControllerSkeleton() {
+ControllerSkeleton::~ControllerSkeleton() {
     if (bus_id_ > 0)
         g_bus_unown_name(bus_id_);
 
@@ -55,11 +57,11 @@
     // as we own the object emitting those signals.
 }
 
-void MiracastControllerSkeleton::SyncProperties() {
+void ControllerSkeleton::SyncProperties() {
     aethercast_interface_manager_set_state(manager_obj_.get(),
                                            NetworkDevice::StateToStr(State()).c_str());
 
-    auto capabilities = DBusHelpers::GenerateCapabilities(Capabilities());
+    auto capabilities = Helpers::GenerateCapabilities(Capabilities());
 
     aethercast_interface_manager_set_capabilities(manager_obj_.get(), capabilities);
 
@@ -69,7 +71,7 @@
     aethercast_interface_manager_set_enabled(manager_obj_.get(), Enabled());
 }
 
-void MiracastControllerSkeleton::OnStateChanged(NetworkDeviceState state) {
+void ControllerSkeleton::OnStateChanged(NetworkDeviceState state) {
     if (!manager_obj_)
         return;
 
@@ -77,15 +79,15 @@
                                            NetworkDevice::StateToStr(State()).c_str());
 }
 
-std::string MiracastControllerSkeleton::GenerateDevicePath(const NetworkDevice::Ptr &device) const {
+std::string ControllerSkeleton::GenerateDevicePath(const NetworkDevice::Ptr &device) const {
     std::string address = device->Address();
     std::replace(address.begin(), address.end(), ':', '_');
     // FIXME using kManagerPath doesn't seem to work. Fails at link time ...
-    return mcs::Utils::Sprintf("/org/aethercast/dev_%s", address.c_str());
+    return ac::Utils::Sprintf("/org/aethercast/dev_%s", address.c_str());
 }
 
-void MiracastControllerSkeleton::OnDeviceFound(const NetworkDevice::Ptr &device) {
-    DEBUG("device %s", device->Address().c_str());
+void ControllerSkeleton::OnDeviceFound(const NetworkDevice::Ptr &device) {
+    AC_DEBUG("device %s", device->Address().c_str());
 
     auto path = GenerateDevicePath(device);
     auto adapter = NetworkDeviceSkeleton::Create(bus_connection_, path , device, shared_from_this());
@@ -94,7 +96,7 @@
     g_dbus_object_manager_server_export(object_manager_.get(), adapter->DBusObject());
 }
 
-void MiracastControllerSkeleton::OnDeviceLost(const NetworkDevice::Ptr &device) {
+void ControllerSkeleton::OnDeviceLost(const NetworkDevice::Ptr &device) {
     auto iter = devices_.find(device->Address());
     if (iter == devices_.end())
         return;
@@ -104,7 +106,7 @@
     devices_.erase(iter);
 }
 
-void MiracastControllerSkeleton::OnDeviceChanged(const NetworkDevice::Ptr &peer) {
+void ControllerSkeleton::OnDeviceChanged(const NetworkDevice::Ptr &peer) {
     auto iter = devices_.find(peer->Address());
     if (iter == devices_.end())
         return;
@@ -112,7 +114,7 @@
     iter->second->SyncProperties();
 }
 
-void MiracastControllerSkeleton::OnChanged() {
+void ControllerSkeleton::OnChanged() {
     SyncProperties();
 }
 
@@ -125,7 +127,7 @@
     return hyphen_name;
 }
 
-gboolean MiracastControllerSkeleton::OnSetProperty(GDBusConnection *connection, const gchar *sender,
+gboolean ControllerSkeleton::OnSetProperty(GDBusConnection *connection, const gchar *sender,
                                                    const gchar *object_path, const gchar *interface_name,
                                                    const gchar *property_name, GVariant *variant,
                                                    GError **error, gpointer user_data) {
@@ -149,7 +151,7 @@
     if (inst && hyphen_name == "enabled" &&
         g_variant_is_of_type(variant, G_VARIANT_TYPE_BOOLEAN)) {
 
-        auto thiz = static_cast<WeakKeepAlive<MiracastControllerSkeleton>*>(inst)->GetInstance().lock();
+        auto thiz = static_cast<WeakKeepAlive<ControllerSkeleton>*>(inst)->GetInstance().lock();
         if (!thiz) {
             g_set_error(error, AETHERCAST_ERROR, AETHERCAST_ERROR_INVALID_STATE, "Invalid state");
             return FALSE;
@@ -170,29 +172,29 @@
     return TRUE;
 }
 
-void MiracastControllerSkeleton::OnNameAcquired(GDBusConnection *connection, const gchar *name, gpointer user_data) {
-    auto inst = static_cast<SharedKeepAlive<MiracastControllerSkeleton>*>(user_data)->ShouldDie();
+void ControllerSkeleton::OnNameAcquired(GDBusConnection *connection, const gchar *name, gpointer user_data) {
+    auto inst = static_cast<SharedKeepAlive<ControllerSkeleton>*>(user_data)->ShouldDie();
 
     inst->manager_obj_.reset(aethercast_interface_manager_skeleton_new());
     g_object_set_data(G_OBJECT(inst->manager_obj_.get()), kManagerSkeletonInstanceKey,
-                      new WeakKeepAlive<MiracastControllerSkeleton>(inst));
+                      new WeakKeepAlive<ControllerSkeleton>(inst));
 
     // We override the property setter method of the skeleton's vtable
     // here to apply some more policy decisions when the user sets
     // specific properties which are state dependent.
     auto vtable = g_dbus_interface_skeleton_get_vtable(G_DBUS_INTERFACE_SKELETON(inst->manager_obj_.get()));
-    vtable->set_property = &MiracastControllerSkeleton::OnSetProperty;
+    vtable->set_property = &ControllerSkeleton::OnSetProperty;
 
     g_signal_connect_data(inst->manager_obj_.get(), "handle-scan",
-                     G_CALLBACK(&MiracastControllerSkeleton::OnHandleScan),
-                     new WeakKeepAlive<MiracastControllerSkeleton>(inst),
-                     [](gpointer data, GClosure *) { delete static_cast<WeakKeepAlive<MiracastControllerSkeleton>*>(data); },
+                     G_CALLBACK(&ControllerSkeleton::OnHandleScan),
+                     new WeakKeepAlive<ControllerSkeleton>(inst),
+                     [](gpointer data, GClosure *) { delete static_cast<WeakKeepAlive<ControllerSkeleton>*>(data); },
                      GConnectFlags(0));
 
     g_signal_connect_data(inst->manager_obj_.get(), "handle-disconnect-all",
-                     G_CALLBACK(&MiracastControllerSkeleton::OnHandleDisconnectAll),
-                     new WeakKeepAlive<MiracastControllerSkeleton>(inst),
-                     [](gpointer data, GClosure *) { delete static_cast<WeakKeepAlive<MiracastControllerSkeleton>*>(data); },
+                     G_CALLBACK(&ControllerSkeleton::OnHandleDisconnectAll),
+                     new WeakKeepAlive<ControllerSkeleton>(inst),
+                     [](gpointer data, GClosure *) { delete static_cast<WeakKeepAlive<ControllerSkeleton>*>(data); },
                      GConnectFlags(0));
 
     inst->SyncProperties();
@@ -203,13 +205,13 @@
     inst->object_manager_.reset(g_dbus_object_manager_server_new(kManagerPath));
     g_dbus_object_manager_server_set_connection(inst->object_manager_.get(), connection);
 
-    INFO("Registered bus name %s", name);
+    AC_INFO("Registered bus name %s", name);
 }
 
-gboolean MiracastControllerSkeleton::OnHandleScan(AethercastInterfaceManager *skeleton,
+gboolean ControllerSkeleton::OnHandleScan(AethercastInterfaceManager *skeleton,
                                               GDBusMethodInvocation *invocation, gpointer user_data) {
     boost::ignore_unused_variable_warning(skeleton);
-    auto inst = static_cast<WeakKeepAlive<MiracastControllerSkeleton>*>(user_data)->GetInstance().lock();
+    auto inst = static_cast<WeakKeepAlive<ControllerSkeleton>*>(user_data)->GetInstance().lock();
 
     if (not inst) {
         g_dbus_method_invocation_return_error(invocation, AETHERCAST_ERROR,
@@ -217,12 +219,12 @@
         return TRUE;
     }
 
-    INFO("Scanning for remote devices");
+    AC_INFO("Scanning for remote devices");
 
     const auto error = inst->Scan();
-    if (error != mcs::Error::kNone) {
+    if (error != ac::Error::kNone) {
         g_dbus_method_invocation_return_error(invocation, AETHERCAST_ERROR,
-            AethercastErrorFromError(error), "%s", mcs::ErrorToString(error).c_str());
+            AethercastErrorFromError(error), "%s", ac::ErrorToString(error).c_str());
         return TRUE;
     }
 
@@ -231,10 +233,10 @@
     return TRUE;
 }
 
-gboolean MiracastControllerSkeleton::OnHandleDisconnectAll(AethercastInterfaceManager *skeleton,
+gboolean ControllerSkeleton::OnHandleDisconnectAll(AethercastInterfaceManager *skeleton,
                                                            GDBusMethodInvocation *invocation, gpointer user_data) {
     boost::ignore_unused_variable_warning(skeleton);
-    const auto inst = static_cast<WeakKeepAlive<MiracastControllerSkeleton>*>(user_data)->GetInstance().lock();
+    const auto inst = static_cast<WeakKeepAlive<ControllerSkeleton>*>(user_data)->GetInstance().lock();
 
     if (not inst) {
         g_dbus_method_invocation_return_error(invocation, AETHERCAST_ERROR,
@@ -245,10 +247,10 @@
     g_object_ref(invocation);
     auto inv = make_shared_gobject(invocation);
 
-    inst->DisconnectAll([inv](mcs::Error error) {
+    inst->DisconnectAll([inv](ac::Error error) {
         if (error != Error::kNone) {
             g_dbus_method_invocation_return_error(inv.get(), AETHERCAST_ERROR,
-                AethercastErrorFromError(error), "%s", mcs::ErrorToString(error).c_str());
+                AethercastErrorFromError(error), "%s", ac::ErrorToString(error).c_str());
             return;
         }
 
@@ -258,23 +260,24 @@
     return TRUE;
 }
 
-std::shared_ptr<MiracastControllerSkeleton> MiracastControllerSkeleton::FinalizeConstruction() {
+std::shared_ptr<ControllerSkeleton> ControllerSkeleton::FinalizeConstruction() {
     auto sp = shared_from_this();
 
     GError *error = nullptr;
     bus_connection_ = make_shared_gobject(g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, &error));
     if (!bus_connection_) {
-        ERROR("Failed to connect with system bus: %s", error->message);
+        AC_ERROR("Failed to connect with system bus: %s", error->message);
         g_error_free(error);
         return sp;
     }
 
     bus_id_ = g_bus_own_name(G_BUS_TYPE_SYSTEM, kBusName, G_BUS_NAME_OWNER_FLAGS_NONE,
-                   nullptr, &MiracastControllerSkeleton::OnNameAcquired, nullptr, new SharedKeepAlive<MiracastControllerSkeleton>{sp}, nullptr);
+                   nullptr, &ControllerSkeleton::OnNameAcquired, nullptr, new SharedKeepAlive<ControllerSkeleton>{sp}, nullptr);
     if (bus_id_ == 0)
-        WARNING("Failed to register bus name");
+        AC_WARNING("Failed to register bus name");
 
     SetDelegate(sp);
     return sp;
 }
-} // namespace mcs
+} // namespace dbus
+} // namespace ac

=== renamed file 'src/mcs/miracastcontrollerskeleton.h' => 'src/ac/dbus/controllerskeleton.h'
--- src/mcs/miracastcontrollerskeleton.h	2016-04-27 07:37:30 +0000
+++ src/ac/dbus/controllerskeleton.h	2016-06-07 08:21:39 +0000
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef MIRACASTSERVICEADAPTOR_H_
-#define MIRACASTSERVICEADAPTOR_H_
+#ifndef AC_CONTROLLERSKELETON_H_
+#define AC_CONTROLLERSKELETON_H_
 
 extern "C" {
 // Ignore all warnings coming from the external headers as we don't
@@ -31,23 +31,24 @@
 #include <memory>
 #include <unordered_map>
 
-#include "scoped_gobject.h"
-
-#include "forwardingmiracastcontroller.h"
-#include "networkdeviceskeleton.h"
-
-namespace mcs {
-class MiracastControllerSkeleton : public std::enable_shared_from_this<MiracastControllerSkeleton>,
-                                   public ForwardingMiracastController,
-                                   public MiracastController::Delegate {
+#include "ac/scoped_gobject.h"
+#include "ac/forwardingcontroller.h"
+
+#include "ac/dbus/networkdeviceskeleton.h"
+
+namespace ac {
+namespace dbus {
+class ControllerSkeleton : public std::enable_shared_from_this<ControllerSkeleton>,
+                           public ForwardingController,
+                           public Controller::Delegate {
 public:
     static constexpr const char *kBusName{"org.aethercast"};
     static constexpr const char *kManagerPath{"/org/aethercast"};
     static constexpr const char *kManagerIface{"org.aethercast.Manager"};
 
-    static std::shared_ptr<MiracastControllerSkeleton> create(const std::shared_ptr<MiracastController> &controller);
+    static std::shared_ptr<ControllerSkeleton> Create(const std::shared_ptr<Controller> &controller);
 
-    ~MiracastControllerSkeleton();
+    ~ControllerSkeleton();
 
     void OnStateChanged(NetworkDeviceState state) override;
     void OnDeviceFound(const NetworkDevice::Ptr &device) override;
@@ -70,8 +71,8 @@
                                   const gchar *property_name, GVariant *variant,
                                   GError **error, gpointer user_data);
 
-    MiracastControllerSkeleton(const std::shared_ptr<MiracastController> &controller);
-    std::shared_ptr<MiracastControllerSkeleton> FinalizeConstruction();
+    ControllerSkeleton(const std::shared_ptr<Controller> &controller);
+    std::shared_ptr<ControllerSkeleton> FinalizeConstruction();
 
     void SyncProperties();
 
@@ -84,5 +85,7 @@
     ScopedGObject<GDBusObjectManagerServer> object_manager_;
     std::unordered_map<std::string,NetworkDeviceSkeleton::Ptr> devices_;
 };
-} // namespace mcs
+} // namespace dbus
+} // namespace ac
+
 #endif

=== renamed file 'src/mcs/dbuserrors.cpp' => 'src/ac/dbus/errors.cpp'
--- src/mcs/dbuserrors.cpp	2016-04-29 07:57:47 +0000
+++ src/ac/dbus/errors.cpp	2016-06-07 08:21:39 +0000
@@ -15,9 +15,10 @@
  *
  */
 
-#include "mcs/dbuserrors.h"
+#include "ac/dbus/errors.h"
 
-namespace mcs {
+namespace ac {
+namespace dbus {
 
 static const GDBusErrorEntry kAethercastErrorEntries[] = {
     { AETHERCAST_ERROR_FAILED, "org.aethercast.Error.Failed" },
@@ -61,4 +62,5 @@
     return AETHERCAST_ERROR_FAILED;
 }
 
-} // namespace mcs
+} // namespace dbus
+} // namespace ac

=== renamed file 'src/mcs/dbuserrors.h' => 'src/ac/dbus/errors.h'
--- src/mcs/dbuserrors.h	2016-04-25 14:51:48 +0000
+++ src/ac/dbus/errors.h	2016-06-07 08:21:39 +0000
@@ -15,13 +15,14 @@
  *
  */
 
-#ifndef MCS_DBUSERRORS_H_
-#define MCS_DBUSERRORS_H_
-
-#include "mcs/types.h"
-#include "mcs/glib_wrapper.h"
-
-namespace mcs {
+#ifndef AC_DBUSERRORS_H_
+#define AC_DBUSERRORS_H_
+
+#include "ac/types.h"
+#include "ac/glib_wrapper.h"
+
+namespace ac {
+namespace dbus {
 
 #define AETHERCAST_ERROR (aethercast_error_quark())
 GQuark aethercast_error_quark(void);
@@ -39,6 +40,7 @@
 
 AethercastError AethercastErrorFromError(const Error &error);
 
-} // namespace mcs
+} // namespace dbus
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/dbushelpers.cpp' => 'src/ac/dbus/helpers.cpp'
--- src/mcs/dbushelpers.cpp	2016-01-21 13:25:31 +0000
+++ src/ac/dbus/helpers.cpp	2016-06-07 08:21:39 +0000
@@ -15,11 +15,12 @@
  *
  */
 
-#include "dbushelpers.h"
-
-namespace mcs {
-
-gchar** DBusHelpers::GenerateDeviceCapabilities(const std::vector<NetworkDeviceRole> &roles) {
+#include "ac/dbus/helpers.h"
+
+namespace ac {
+namespace dbus {
+
+gchar** Helpers::GenerateDeviceCapabilities(const std::vector<NetworkDeviceRole> &roles) {
     gchar **capabilities = g_new0(gchar*, roles.size() + 1);
     int n = 0;
     for (auto role : roles)
@@ -28,7 +29,7 @@
     return capabilities;
 }
 
-gchar** DBusHelpers::GenerateCapabilities(const std::vector<NetworkManager::Capability> &capabilities) {
+gchar** Helpers::GenerateCapabilities(const std::vector<NetworkManager::Capability> &capabilities) {
     gchar** out_capabilities = g_new0(gchar*, capabilities.size() + 1);
     int n = 0;
     for (auto capability : capabilities) {
@@ -39,7 +40,7 @@
     return out_capabilities;
 }
 
-void DBusHelpers::ParseDictionary(GVariant *properties, std::function<void(std::string, GVariant*)> callback, const std::string &key_filter) {
+void Helpers::ParseDictionary(GVariant *properties, std::function<void(std::string, GVariant*)> callback, const std::string &key_filter) {
     if (!callback || !properties)
         return;
 
@@ -61,7 +62,7 @@
     }
 }
 
-void DBusHelpers::ParseArray(GVariant *array, std::function<void(GVariant*)> callback) {
+void Helpers::ParseArray(GVariant *array, std::function<void(GVariant*)> callback) {
     if (!callback || !array)
         return;
 
@@ -71,7 +72,8 @@
     }
 }
 
-} // namespace mcs
+} // namespace dbus
+} // namespace ac
 
 
 

=== renamed file 'src/mcs/dbushelpers.h' => 'src/ac/dbus/helpers.h'
--- src/mcs/dbushelpers.h	2016-03-23 09:03:50 +0000
+++ src/ac/dbus/helpers.h	2016-06-07 08:21:39 +0000
@@ -20,20 +20,20 @@
 
 #include <functional>
 
-#include "mcs/glib_wrapper.h"
-
-#include "mcs/networkmanager.h"
-#include "mcs/scoped_gobject.h"
-
-namespace mcs {
-
-struct DBusHelpers {
+#include "ac/glib_wrapper.h"
+
+#include "ac/networkmanager.h"
+#include "ac/scoped_gobject.h"
+
+namespace ac {
+namespace dbus {
+struct Helpers {
     static gchar** GenerateCapabilities(const std::vector<NetworkManager::Capability> &capabilities);
     static gchar** GenerateDeviceCapabilities(const std::vector<NetworkDeviceRole> &roles);
     static void ParseDictionary(GVariant *properties, std::function<void(std::string, GVariant*)> callback, const std::string &key_filter = "");
     static void ParseArray(GVariant *array, std::function<void(GVariant*)> callback);
 };
-
-} // namespace mcs
+} // namespace dbus
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/networkdeviceskeleton.cpp' => 'src/ac/dbus/networkdeviceskeleton.cpp'
--- src/mcs/networkdeviceskeleton.cpp	2016-04-25 14:51:48 +0000
+++ src/ac/dbus/networkdeviceskeleton.cpp	2016-06-07 08:21:39 +0000
@@ -18,20 +18,21 @@
 #include <algorithm>
 #include <boost/concept_check.hpp>
 
-#include "mcs/networkdeviceskeleton.h"
-#include "mcs/utils.h"
-#include "mcs/keep_alive.h"
-#include "mcs/logger.h"
-#include "mcs/dbushelpers.h"
-#include "mcs/dbuserrors.h"
-
-namespace mcs {
-
-NetworkDeviceSkeleton::Ptr NetworkDeviceSkeleton::Create(const SharedGObject<GDBusConnection> &connection, const std::string &path, const NetworkDevice::Ptr &device, const MiracastController::Ptr &controller) {
+#include "ac/utils.h"
+#include "ac/keep_alive.h"
+#include "ac/logger.h"
+
+#include "ac/dbus/networkdeviceskeleton.h"
+#include "ac/dbus/helpers.h"
+#include "ac/dbus/errors.h"
+
+namespace ac {
+namespace dbus {
+NetworkDeviceSkeleton::Ptr NetworkDeviceSkeleton::Create(const SharedGObject<GDBusConnection> &connection, const std::string &path, const NetworkDevice::Ptr &device, const Controller::Ptr &controller) {
     return std::shared_ptr<NetworkDeviceSkeleton>(new NetworkDeviceSkeleton(connection, path, device, controller))->FinalizeConstruction();
 }
 
-NetworkDeviceSkeleton::NetworkDeviceSkeleton(const SharedGObject<GDBusConnection> &connection, const std::string &path, const NetworkDevice::Ptr &device, const MiracastController::Ptr &controller) :
+NetworkDeviceSkeleton::NetworkDeviceSkeleton(const SharedGObject<GDBusConnection> &connection, const std::string &path, const NetworkDevice::Ptr &device, const Controller::Ptr &controller) :
     ForwardingNetworkDevice(device),
     connection_(connection),
     object_(make_shared_gobject(aethercast_interface_object_skeleton_new(path.c_str()))),
@@ -53,7 +54,7 @@
     SyncProperties();
 
     if (!object_)
-        ERROR("Failed to create object for device %s", Address());
+        AC_ERROR("Failed to create object for device %s", Address());
     else
         aethercast_interface_object_skeleton_set_device(object_.get(), device_iface_.get());
 
@@ -65,7 +66,7 @@
     aethercast_interface_device_set_name(device_iface_.get(), Name().c_str());
     aethercast_interface_device_set_state(device_iface_.get(), NetworkDevice::StateToStr(State()).c_str());
 
-    auto capabilities = DBusHelpers::GenerateDeviceCapabilities(SupportedRoles());
+    auto capabilities = Helpers::GenerateDeviceCapabilities(SupportedRoles());
     aethercast_interface_device_set_capabilities(device_iface_.get(), capabilities);
     g_strfreev(capabilities);
 }
@@ -78,8 +79,8 @@
     return path_;
 }
 
-// TODO(tvoss,morphis): Refactor mcs::NetworkDevice to have Connect/Disconnect defined on its interfaces.
-// It feels quite dirty to require both an instance of mcs::NetworkDevice and mcs::MiracastController to
+// TODO(tvoss,morphis): Refactor ac::NetworkDevice to have Connect/Disconnect defined on its interfaces.
+// It feels quite dirty to require both an instance of ac::NetworkDevice and ac::Controller to
 // implement the connect/disconnect calls coming in via the bus. The complication then is the async handling of
 // the invocation, as we will likely have to reach out to WPASupplicant for example (which is dispatched via the same
 // event loop as we are). In addition, we should not start littering our public interfaces by handing down callbacks.
@@ -100,10 +101,10 @@
     g_object_ref(invocation);
     auto inv = make_shared_gobject(invocation);
 
-    inst->controller_->Connect(inst->Fwd(), [inv](mcs::Error error) {
+    inst->controller_->Connect(inst->Fwd(), [inv](ac::Error error) {
         if (error != Error::kNone) {
             g_dbus_method_invocation_return_error(inv.get(), AETHERCAST_ERROR,
-                AethercastErrorFromError(error), "%s", mcs::ErrorToString(error).c_str());
+                AethercastErrorFromError(error), "%s", ac::ErrorToString(error).c_str());
             return;
         }
 
@@ -129,10 +130,10 @@
     g_object_ref(invocation);
     auto inv = make_shared_gobject(invocation);
 
-    inst->controller_->Disconnect(inst->Fwd(), [inv](mcs::Error error) {
+    inst->controller_->Disconnect(inst->Fwd(), [inv](ac::Error error) {
         if (error != Error::kNone) {
             g_dbus_method_invocation_return_error(inv.get(), AETHERCAST_ERROR,
-                AethercastErrorFromError(error), "%s", mcs::ErrorToString(error).c_str());
+                AethercastErrorFromError(error), "%s", ac::ErrorToString(error).c_str());
             return;
         }
 
@@ -141,5 +142,5 @@
 
     return TRUE;
 }
-
-} // namespace mcs
+} // namespace dbus
+} // namespace ac

=== renamed file 'src/mcs/networkdeviceskeleton.h' => 'src/ac/dbus/networkdeviceskeleton.h'
--- src/mcs/networkdeviceskeleton.h	2016-03-23 15:06:56 +0000
+++ src/ac/dbus/networkdeviceskeleton.h	2016-06-07 08:21:39 +0000
@@ -28,19 +28,19 @@
 #pragma GCC diagnostic pop
 }
 
-#include "forwardingnetworkdevice.h"
-#include "miracastcontroller.h"
-#include "scoped_gobject.h"
-#include "shared_gobject.h"
-
-namespace mcs {
-
+#include "ac/forwardingnetworkdevice.h"
+#include "ac/controller.h"
+#include "ac/scoped_gobject.h"
+#include "ac/shared_gobject.h"
+
+namespace ac {
+namespace dbus {
 class NetworkDeviceSkeleton : public std::enable_shared_from_this<NetworkDeviceSkeleton>,
                               public ForwardingNetworkDevice {
 public:
     typedef std::shared_ptr<NetworkDeviceSkeleton> Ptr;
 
-    static NetworkDeviceSkeleton::Ptr Create(const SharedGObject<GDBusConnection> &connection, const std::string &path, const NetworkDevice::Ptr &device, const MiracastController::Ptr &controller);
+    static NetworkDeviceSkeleton::Ptr Create(const SharedGObject<GDBusConnection> &connection, const std::string &path, const NetworkDevice::Ptr &device, const Controller::Ptr &controller);
 
     GDBusObjectSkeleton* DBusObject() const;
     std::string Path() const;
@@ -54,7 +54,7 @@
                                    gpointer user_data);
 
 private:
-    NetworkDeviceSkeleton(const SharedGObject<GDBusConnection> &connection, const std::string &path, const NetworkDevice::Ptr &device, const MiracastController::Ptr &service);
+    NetworkDeviceSkeleton(const SharedGObject<GDBusConnection> &connection, const std::string &path, const NetworkDevice::Ptr &device, const Controller::Ptr &service);
 
     std::shared_ptr<NetworkDeviceSkeleton> FinalizeConstruction();
 
@@ -62,10 +62,10 @@
     SharedGObject<GDBusConnection> connection_;
     SharedGObject<AethercastInterfaceObjectSkeleton> object_;
     std::string path_;
-    MiracastController::Ptr controller_;
+    Controller::Ptr controller_;
     ScopedGObject<AethercastInterfaceDevice> device_iface_;
 };
-
-} // namespace mcs
+} // namespace dbus
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/forwardingmiracastcontroller.cpp' => 'src/ac/forwardingcontroller.cpp'
--- src/mcs/forwardingmiracastcontroller.cpp	2016-04-27 07:37:30 +0000
+++ src/ac/forwardingcontroller.cpp	2016-06-07 08:21:39 +0000
@@ -15,58 +15,58 @@
  *
  */
 
-#include "forwardingmiracastcontroller.h"
-
 #include <stdexcept>
 
-namespace mcs {
-ForwardingMiracastController::ForwardingMiracastController(const MiracastController::Ptr& fwd) : fwd_{fwd} {
+#include "ac/forwardingcontroller.h"
+
+namespace ac {
+ForwardingController::ForwardingController(const Controller::Ptr& fwd) : fwd_{fwd} {
     if (not fwd_) {
-        throw std::logic_error{"Cannot operate without a valid MiracastController instance."};
+        throw std::logic_error{"Cannot operate without a valid controller instance."};
     }
 }
 
-void ForwardingMiracastController::SetDelegate(const std::weak_ptr<MiracastController::Delegate> &delegate) {
+void ForwardingController::SetDelegate(const std::weak_ptr<Controller::Delegate> &delegate) {
     fwd_->SetDelegate(delegate);
 }
 
-void ForwardingMiracastController::ResetDelegate() {
+void ForwardingController::ResetDelegate() {
     fwd_->ResetDelegate();
 }
 
-void ForwardingMiracastController::Connect(const NetworkDevice::Ptr &device, ResultCallback callback) {
+void ForwardingController::Connect(const NetworkDevice::Ptr &device, ResultCallback callback) {
     fwd_->Connect(device, callback);
 }
 
-void ForwardingMiracastController::Disconnect(const NetworkDevice::Ptr &device, ResultCallback callback) {
+void ForwardingController::Disconnect(const NetworkDevice::Ptr &device, ResultCallback callback) {
     fwd_->Disconnect(device, callback);
 }
 
-void ForwardingMiracastController::DisconnectAll(ResultCallback callback) {
+void ForwardingController::DisconnectAll(ResultCallback callback) {
     fwd_->DisconnectAll(callback);
 }
 
-mcs::Error ForwardingMiracastController::Scan(const std::chrono::seconds &timeout) {
+ac::Error ForwardingController::Scan(const std::chrono::seconds &timeout) {
     return fwd_->Scan(timeout);
 }
 
-NetworkDeviceState ForwardingMiracastController::State() const {
+NetworkDeviceState ForwardingController::State() const {
     return fwd_->State();
 }
 
-std::vector<NetworkManager::Capability> ForwardingMiracastController::Capabilities() const {
+std::vector<NetworkManager::Capability> ForwardingController::Capabilities() const {
     return fwd_->Capabilities();
 }
 
-bool ForwardingMiracastController::Scanning() const {
+bool ForwardingController::Scanning() const {
     return fwd_->Scanning();
 }
 
-bool ForwardingMiracastController::Enabled() const {
+bool ForwardingController::Enabled() const {
     return fwd_->Enabled();
 }
 
-Error ForwardingMiracastController::SetEnabled(bool enabled) {
+Error ForwardingController::SetEnabled(bool enabled) {
     return fwd_->SetEnabled(enabled);
 }
 }

=== renamed file 'src/mcs/forwardingmiracastcontroller.h' => 'src/ac/forwardingcontroller.h'
--- src/mcs/forwardingmiracastcontroller.h	2016-04-27 07:37:30 +0000
+++ src/ac/forwardingcontroller.h	2016-06-07 08:21:39 +0000
@@ -15,16 +15,16 @@
  *
  */
 
-#ifndef FORWARDING_MIRACAST_CONTROLLER_H_
-#define FORWARDING_MIRACAST_CONTROLLER_H_
-
-#include "miracastcontroller.h"
-
-namespace mcs {
-class ForwardingMiracastController : public MiracastController
+#ifndef AC_FORWARDING_MIRACAST_CONTROLLER_H_
+#define AC_FORWARDING_MIRACAST_CONTROLLER_H_
+
+#include "ac/controller.h"
+
+namespace ac {
+class ForwardingController : public Controller
 {
 public:
-    explicit ForwardingMiracastController(const MiracastController::Ptr& fwd);
+    explicit ForwardingController(const Controller::Ptr& fwd);
 
     virtual void SetDelegate(const std::weak_ptr<Delegate> &delegate) override;
     virtual void ResetDelegate() override;
@@ -34,7 +34,7 @@
 
     virtual void DisconnectAll(ResultCallback callback) override;
 
-    virtual mcs::Error Scan(const std::chrono::seconds &timeout = std::chrono::seconds{30}) override;
+    virtual ac::Error Scan(const std::chrono::seconds &timeout = std::chrono::seconds{30}) override;
 
     virtual NetworkDeviceState State() const override;
     virtual std::vector<NetworkManager::Capability> Capabilities() const override;
@@ -44,7 +44,7 @@
     virtual Error SetEnabled(bool enabled) override;
 
 private:
-    MiracastController::Ptr fwd_;
+    Controller::Ptr fwd_;
 };
-} // namespace mcs
+} // namespace ac
 #endif

=== renamed file 'src/mcs/forwardingnetworkdevice.cpp' => 'src/ac/forwardingnetworkdevice.cpp'
--- src/mcs/forwardingnetworkdevice.cpp	2015-12-16 08:04:35 +0000
+++ src/ac/forwardingnetworkdevice.cpp	2016-06-07 08:21:39 +0000
@@ -17,7 +17,7 @@
 
 #include "forwardingnetworkdevice.h"
 
-namespace mcs {
+namespace ac {
 
 ForwardingNetworkDevice::ForwardingNetworkDevice(const NetworkDevice::Ptr& fwd) : fwd_(fwd) {
     if (not fwd_) {
@@ -48,4 +48,4 @@
 const NetworkDevice::Ptr& ForwardingNetworkDevice::Fwd() const {
     return fwd_;
 }
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/forwardingnetworkdevice.h' => 'src/ac/forwardingnetworkdevice.h'
--- src/mcs/forwardingnetworkdevice.h	2015-12-16 08:04:35 +0000
+++ src/ac/forwardingnetworkdevice.h	2016-06-07 08:21:39 +0000
@@ -20,7 +20,7 @@
 
 #include "networkdevice.h"
 
-namespace mcs {
+namespace ac {
 
 class ForwardingNetworkDevice : public NetworkDevice {
 public:
@@ -38,5 +38,5 @@
 private:
     NetworkDevice::Ptr fwd_;
 };
-} // namespace mcs
+} // namespace ac
 #endif

=== renamed file 'src/mcs/glib_wrapper.h' => 'src/ac/glib_wrapper.h'
--- src/mcs/glib_wrapper.h	2016-03-23 15:06:56 +0000
+++ src/ac/glib_wrapper.h	2016-06-07 08:21:39 +0000
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef MCS_GLIBWRAPPER_H_
-#define MCS_GLIBWRAPPER_H_
+#ifndef AC_GLIBWRAPPER_H_
+#define AC_GLIBWRAPPER_H_
 
 // Ignore all warnings coming from the external GLib headers as
 // we don't control them and also don't want to get any warnings

=== renamed file 'src/mcs/gobject_deleter.h' => 'src/ac/gobject_deleter.h'
--- src/mcs/gobject_deleter.h	2016-01-07 17:12:38 +0000
+++ src/ac/gobject_deleter.h	2016-06-07 08:21:39 +0000
@@ -19,9 +19,9 @@
 
 #include <glib-object.h>
 
-#include <mcs/logger.h>
+#include <ac/logger.h>
 
-namespace mcs {
+namespace ac {
 // A GObjectDeleter considers T to be a GObject and
 // provides an operator() that decrements the reference
 // count of an instance of T.

=== renamed file 'src/mcs/ip_v4_address.h' => 'src/ac/ip_v4_address.h'
--- src/mcs/ip_v4_address.h	2015-12-02 22:05:26 +0000
+++ src/ac/ip_v4_address.h	2016-06-07 08:21:39 +0000
@@ -20,7 +20,7 @@
 
 #include <boost/asio/ip/address_v4.hpp>
 
-namespace mcs {
+namespace ac {
 using IpV4Address = boost::asio::ip::address_v4;
 }
 

=== renamed file 'src/mcs/keep_alive.h' => 'src/ac/keep_alive.h'
--- src/mcs/keep_alive.h	2015-12-03 09:03:48 +0000
+++ src/ac/keep_alive.h	2016-06-07 08:21:39 +0000
@@ -19,7 +19,7 @@
 
 #include <memory>
 
-namespace mcs {
+namespace ac {
 namespace detail {
 template<typename T, template<typename> class Ptr>
 class KeepAlive {

=== renamed file 'src/mcs/logger.cpp' => 'src/ac/logger.cpp'
--- src/mcs/logger.cpp	2016-03-23 09:03:50 +0000
+++ src/ac/logger.cpp	2016-06-07 08:21:39 +0000
@@ -30,17 +30,17 @@
 
 namespace {
 namespace attrs {
-BOOST_LOG_ATTRIBUTE_KEYWORD(Severity, "mcs::Severity", mcs::Logger::Severity)
-BOOST_LOG_ATTRIBUTE_KEYWORD(Location, "Location", mcs::Logger::Location)
+BOOST_LOG_ATTRIBUTE_KEYWORD(Severity, "ac::Severity", ac::Logger::Severity)
+BOOST_LOG_ATTRIBUTE_KEYWORD(Location, "Location", ac::Logger::Location)
 BOOST_LOG_ATTRIBUTE_KEYWORD(Timestamp, "Timestamp", boost::posix_time::ptime)
 }
 
-struct BoostLogLogger : public mcs::Logger {
+struct BoostLogLogger : public ac::Logger {
     BoostLogLogger() :
         initialized_(false) {
     }
 
-    void Init(const mcs::Logger::Severity &severity = mcs::Logger::Severity::kWarning) override {
+    void Init(const ac::Logger::Severity &severity = ac::Logger::Severity::kWarning) override {
         if (initialized_)
             return;
 
@@ -92,16 +92,16 @@
     bool initialized_;
 };
 
-std::shared_ptr<mcs::Logger>& MutableInstance() {
-    static std::shared_ptr<mcs::Logger> instance{new BoostLogLogger()};
+std::shared_ptr<ac::Logger>& MutableInstance() {
+    static std::shared_ptr<ac::Logger> instance{new BoostLogLogger()};
     return instance;
 }
 
-void SetInstance(const std::shared_ptr<mcs::Logger>& logger) {
+void SetInstance(const std::shared_ptr<ac::Logger>& logger) {
     MutableInstance() = logger;
 }
 }
-namespace mcs {
+namespace ac {
 void Logger::Trace(const std::string& message, const boost::optional<Location>& location) {
     Log(Severity::kTrace, message, location);
 }
@@ -126,14 +126,14 @@
     Log(Severity::kFatal, message, location);
 }
 
-std::ostream& operator<<(std::ostream& strm, mcs::Logger::Severity severity) {
+std::ostream& operator<<(std::ostream& strm, ac::Logger::Severity severity) {
     switch (severity) {
-    case mcs::Logger::Severity::kTrace: return strm << "TT";
-    case mcs::Logger::Severity::kDebug: return strm << "DD";
-    case mcs::Logger::Severity::kInfo: return strm << "II";
-    case mcs::Logger::Severity::kWarning: return strm << "WW";
-    case mcs::Logger::Severity::kError: return strm << "EE";
-    case mcs::Logger::Severity::kFatal: return strm << "FF";
+    case ac::Logger::Severity::kTrace: return strm << "TT";
+    case ac::Logger::Severity::kDebug: return strm << "DD";
+    case ac::Logger::Severity::kInfo: return strm << "II";
+    case ac::Logger::Severity::kWarning: return strm << "WW";
+    case ac::Logger::Severity::kError: return strm << "EE";
+    case ac::Logger::Severity::kFatal: return strm << "FF";
     default: return strm << static_cast<uint>(severity);
     }
 }

=== renamed file 'src/mcs/logger.h' => 'src/ac/logger.h'
--- src/mcs/logger.h	2016-02-29 12:05:03 +0000
+++ src/ac/logger.h	2016-06-07 08:21:39 +0000
@@ -25,10 +25,10 @@
 
 #include <string>
 
-namespace mcs {
+namespace ac {
 // A Logger enables persisting of messages describing & explaining the
 // state of the system.
-class Logger : public mcs::NonCopyable {
+class Logger : public ac::NonCopyable {
 public:
     // Severity enumerates all known severity levels
     // applicable to log messages.
@@ -48,7 +48,7 @@
         std::uint32_t line; // The line in file that resulted in the log message.
     };
 
-    virtual void Init(const mcs::Logger::Severity &severity = mcs::Logger::Severity::kWarning) = 0;
+    virtual void Init(const ac::Logger::Severity &severity = ac::Logger::Severity::kWarning) = 0;
 
     virtual void Log(Severity severity, const std::string &message, const boost::optional<Location>& location) = 0;
 
@@ -100,25 +100,18 @@
 // operator<< inserts location into out.
 std::ostream& operator<<(std::ostream& out, const Logger::Location &location);
 
-// Log returns the mcs-wide configured logger instance.
+// Log returns the ac-wide configured logger instance.
 // Save to call before/after main.
 Logger& Log();
-// SetLog installs the given logger as mcs-wide default logger.
+// SetLog installs the given logger as ac-wide default logger.
 void SetLogger(const std::shared_ptr<Logger>& logger);
-
-#define TRACE(...) Log().Tracef(Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
-#define DEBUG(...) Log().Debugf(Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
-#define INFO(...) Log().Infof(Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
-#define WARNING(...) Log().Warningf(Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
-#define ERROR(...) Log().Errorf(Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
-#define FATAL(...) Log().Fatalf(Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
 }
 
-#define MCS_TRACE(...) mcs::Log().Tracef(mcs::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
-#define MCS_DEBUG(...) mcs::Log().Debugf(mcs::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
-#define MCS_INFO(...) mcs::Log().Infof(mcs::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
-#define MCS_WARNING(...) mcs::Log().Warningf(mcs::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
-#define MCS_ERROR(...) mcs::Log().Errorf(mcs::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
-#define MCS_FATAL(...) mcs::Log().Fatalf(mcs::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
+#define AC_TRACE(...) ac::Log().Tracef(ac::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
+#define AC_DEBUG(...) ac::Log().Debugf(ac::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
+#define AC_INFO(...) ac::Log().Infof(ac::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
+#define AC_WARNING(...) ac::Log().Warningf(ac::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
+#define AC_ERROR(...) ac::Log().Errorf(ac::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
+#define AC_FATAL(...) ac::Log().Fatalf(ac::Logger::Location{__FILE__, __FUNCTION__, __LINE__}, __VA_ARGS__)
 
 #endif

=== renamed file 'src/mcs/mac_address.h' => 'src/ac/mac_address.h'
--- src/mcs/mac_address.h	2015-12-03 07:08:33 +0000
+++ src/ac/mac_address.h	2016-06-07 08:21:39 +0000
@@ -20,7 +20,7 @@
 
 #include <string>
 
-namespace mcs {
+namespace ac {
 using MacAddress = std::string;
 }
 

=== renamed file 'src/mcs/main.cpp' => 'src/ac/main.cpp'
--- src/mcs/main.cpp	2015-12-03 16:41:00 +0000
+++ src/ac/main.cpp	2016-06-07 08:21:39 +0000
@@ -15,8 +15,8 @@
  *
  */
 
-#include "miracastservice.h"
+#include "service.h"
 
 int main(int argc, char **argv) {
-    return mcs::MiracastService::Main(mcs::MiracastService::MainOptions::FromCommandLine(argc, argv));
+    return ac::Service::Main(ac::Service::MainOptions::FromCommandLine(argc, argv));
 }

=== renamed file 'src/mcs/mediamanagerfactory.cpp' => 'src/ac/mediamanagerfactory.cpp'
--- src/mcs/mediamanagerfactory.cpp	2016-04-06 07:52:19 +0000
+++ src/ac/mediamanagerfactory.cpp	2016-06-07 08:21:39 +0000
@@ -17,59 +17,60 @@
 
 #include <string.h>
 
-#include "logger.h"
-#include "mediamanagerfactory.h"
-#include "mir/sourcemediamanager.h"
-#include "utils.h"
-#include "logging.h"
-
-#include "mcs/common/threadedexecutorfactory.h"
-
-#include "mcs/report/reportfactory.h"
-
-#include "mcs/network/udpstream.h"
-
-#include "mcs/android/h264encoder.h"
-
-namespace mcs {
+#include "ac/logger.h"
+#include "ac/mediamanagerfactory.h"
+#include "ac/utils.h"
+#include "ac/logger.h"
+
+#include "ac/mir/sourcemediamanager.h"
+
+#include "ac/common/threadedexecutorfactory.h"
+
+#include "ac/report/reportfactory.h"
+
+#include "ac/network/udpstream.h"
+
+#include "ac/android/h264encoder.h"
+
+namespace ac {
 
 void NullSourceMediaManager::Play() {
-    WARNING("NullSourceMediaManager: Not implemented");
+    AC_WARNING("NullSourceMediaManager: Not implemented");
 }
 
 void NullSourceMediaManager::Pause() {
-    WARNING("NullSourceMediaManager: Not implemented");
+    AC_WARNING("NullSourceMediaManager: Not implemented");
 }
 
 void NullSourceMediaManager::Teardown() {
-    WARNING("NullSourceMediaManager: Not implemented");
+    AC_WARNING("NullSourceMediaManager: Not implemented");
 }
 
 bool NullSourceMediaManager::IsPaused() const {
-    WARNING("NullSourceMediaManager: Not implemented");
+    AC_WARNING("NullSourceMediaManager: Not implemented");
     return false;
 }
 
 bool NullSourceMediaManager::Configure() {
-    WARNING("NullSourceMediaManager: Not implemented");
+    AC_WARNING("NullSourceMediaManager: Not implemented");
     return false;
 }
 
 std::shared_ptr<BaseSourceMediaManager> MediaManagerFactory::CreateSource(const std::string &remote_address,
-                                                                          const mcs::network::Stream::Ptr &output_stream) {
+                                                                          const ac::network::Stream::Ptr &output_stream) {
     std::string type = Utils::GetEnvValue("MIRACAST_SOURCE_TYPE");
     if (type.length() == 0)
         type = "mir";
 
-    DEBUG("Creating source media manager of type %s", type.c_str());
+    AC_DEBUG("Creating source media manager of type %s", type.c_str());
 
     if (type == "mir") {
         const auto executor_factory = std::make_shared<common::ThreadedExecutorFactory>();
         const auto report_factory = report::ReportFactory::Create();
-        const auto screencast = std::make_shared<mcs::mir::Screencast>();
-        const auto encoder = mcs::android::H264Encoder::Create(report_factory->CreateEncoderReport());
+        const auto screencast = std::make_shared<ac::mir::Screencast>();
+        const auto encoder = ac::android::H264Encoder::Create(report_factory->CreateEncoderReport());
 
-        return std::make_shared<mcs::mir::SourceMediaManager>(
+        return std::make_shared<ac::mir::SourceMediaManager>(
                     remote_address,
                     executor_factory,
                     screencast,
@@ -80,4 +81,4 @@
 
     return std::make_shared<NullSourceMediaManager>();
 }
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/mediamanagerfactory.h' => 'src/ac/mediamanagerfactory.h'
--- src/mcs/mediamanagerfactory.h	2016-04-06 07:52:19 +0000
+++ src/ac/mediamanagerfactory.h	2016-06-07 08:21:39 +0000
@@ -20,12 +20,12 @@
 
 #include <memory>
 
-#include "mcs/basesourcemediamanager.h"
-
-#include "mcs/network/types.h"
-#include "mcs/network/stream.h"
-
-namespace mcs {
+#include "ac/basesourcemediamanager.h"
+
+#include "ac/network/types.h"
+#include "ac/network/stream.h"
+
+namespace ac {
 
 // Only here to make unit testing easier for the factory class
 class NullSourceMediaManager : public BaseSourceMediaManager {
@@ -42,7 +42,7 @@
 class MediaManagerFactory {
 public:
     static std::shared_ptr<BaseSourceMediaManager> CreateSource(const std::string &remote_address,
-                                                                const mcs::network::Stream::Ptr &output_stream);
+                                                                const ac::network::Stream::Ptr &output_stream);
 };
-} // namespace mcs
+} // namespace ac
 #endif

=== added directory 'src/ac/mir'
=== renamed file 'src/mcs/mir/screencast.cpp' => 'src/ac/mir/screencast.cpp'
--- src/mcs/mir/screencast.cpp	2016-04-29 05:46:17 +0000
+++ src/ac/mir/screencast.cpp	2016-06-07 08:21:39 +0000
@@ -17,15 +17,15 @@
 
 #include <boost/concept_check.hpp>
 
-#include "mcs/logger.h"
-#include "mcs/mir/screencast.h"
+#include "ac/logger.h"
+#include "ac/mir/screencast.h"
 
 namespace {
 static constexpr const char *kMirSocket{"/run/mir_socket"};
 static constexpr const char *kMirConnectionName{"aethercast screencast client"};
 }
 
-namespace mcs {
+namespace ac {
 namespace mir {
 
 Screencast::Screencast() :
@@ -35,7 +35,7 @@
 }
 
 Screencast::~Screencast() {
-    MCS_DEBUG("");
+    AC_DEBUG("");
 
     if (screencast_)
         mir_screencast_release_sync(screencast_);
@@ -49,23 +49,23 @@
         return false;
 
     if (output.mode != video::DisplayOutput::Mode::kExtend) {
-        MCS_ERROR("Unsupported display output mode specified '%s'", output.mode);
+        AC_ERROR("Unsupported display output mode specified '%s'", output.mode);
         return false;
     }
 
-    MCS_DEBUG("Setting up screencast [%s %dx%d]", output.mode,
+    AC_DEBUG("Setting up screencast [%s %dx%d]", output.mode,
               output.width, output.height);
 
     connection_ = mir_connect_sync(kMirSocket, kMirConnectionName);
     if (!mir_connection_is_valid(connection_)) {
-        MCS_ERROR("Failed to connect to Mir server: %s",
+        AC_ERROR("Failed to connect to Mir server: %s",
                   mir_connection_get_error_message(connection_));
         return false;
     }
 
     const auto config = mir_connection_create_display_config(connection_);
     if (!config) {
-        MCS_ERROR("Failed to create display configuration: %s",
+        AC_ERROR("Failed to create display configuration: %s",
                   mir_connection_get_error_message(connection_));
         return false;
     }
@@ -85,7 +85,7 @@
     }
 
     if (!active_output) {
-        MCS_ERROR("Failed to find a suitable display output");
+        AC_ERROR("Failed to find a suitable display output");
         return false;
     }
 
@@ -93,7 +93,7 @@
 
     auto spec = mir_create_screencast_spec(connection_);
     if (!spec) {
-        ERROR("Failed to create Mir screencast specification: %s",
+        AC_ERROR("Failed to create Mir screencast specification: %s",
               mir_screencast_get_error_message(screencast_));
         return false;
     }
@@ -114,7 +114,7 @@
 
     output_.refresh_rate = display_mode->refresh_rate;
 
-    MCS_INFO("Selected output ID %i [(%ix%i)+(%ix%i)] orientation %d",
+    AC_INFO("Selected output ID %i [(%ix%i)+(%ix%i)] orientation %d",
              output_index,
              display_mode->vertical_resolution,
              display_mode->horizontal_resolution,
@@ -126,7 +126,7 @@
     mir_connection_get_available_surface_formats(connection_, &pixel_format,
                                                  1, &num_pixel_formats);
     if (num_pixel_formats == 0) {
-        MCS_ERROR("Failed to find suitable pixel format: %s",
+        AC_ERROR("Failed to find suitable pixel format: %s",
                   mir_connection_get_error_message(connection_));
         return false;
     }
@@ -138,14 +138,14 @@
     screencast_ = mir_screencast_create_sync(spec);
     mir_screencast_spec_release(spec);
     if (!mir_screencast_is_valid(screencast_)) {
-        ERROR("Failed to create Mir screencast: %s",
+        AC_ERROR("Failed to create Mir screencast: %s",
               mir_screencast_get_error_message(screencast_));
         return false;
     }
 
     buffer_stream_ = mir_screencast_get_buffer_stream(screencast_);
     if (!buffer_stream_) {
-        MCS_ERROR("Failed to setup Mir buffer stream");
+        AC_ERROR("Failed to setup Mir buffer stream");
         return false;
     }
 
@@ -174,4 +174,4 @@
     return reinterpret_cast<void*>(buffer);
 }
 } // namespace mir
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/mir/screencast.h' => 'src/ac/mir/screencast.h'
--- src/mcs/mir/screencast.h	2016-04-28 13:49:00 +0000
+++ src/ac/mir/screencast.h	2016-06-07 08:21:39 +0000
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef MCS_MIR_CONNECTOR_H_
-#define MCS_MIR_CONNECTOR_H_
+#ifndef AC_MIR_CONNECTOR_H_
+#define AC_MIR_CONNECTOR_H_
 
 #include <memory>
 
@@ -24,21 +24,21 @@
 #include <mir_toolkit/mir_screencast.h>
 #include <mir_toolkit/mir_buffer_stream.h>
 
-#include "mcs/non_copyable.h"
-
-#include "mcs/video/bufferproducer.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+
+#include "ac/video/bufferproducer.h"
+
+namespace ac {
 namespace mir {
 
-class Screencast : public mcs::video::BufferProducer {
+class Screencast : public ac::video::BufferProducer {
 public:
     explicit Screencast();
     ~Screencast();
 
     bool Setup(const video::DisplayOutput &output) override;
 
-    // From mcs::video::BufferProducer
+    // From ac::video::BufferProducer
     void SwapBuffers() override;
     void* CurrentBuffer() const override;
     video::DisplayOutput OutputMode() const override;
@@ -51,6 +51,6 @@
 };
 
 } // namespace mir
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/mir/sourcemediamanager.cpp' => 'src/ac/mir/sourcemediamanager.cpp'
--- src/mcs/mir/sourcemediamanager.cpp	2016-05-06 13:08:10 +0000
+++ src/ac/mir/sourcemediamanager.cpp	2016-06-07 08:21:39 +0000
@@ -15,40 +15,40 @@
  *
  */
 
-#include "mcs/logger.h"
-#include "mcs/keep_alive.h"
-
-#include "mcs/common/threadedexecutor.h"
-#include "mcs/common/threadedexecutorfactory.h"
-
-#include "mcs/network/udpstream.h"
-
-#include "mcs/report/reportfactory.h"
-
-#include "mcs/video/videoformat.h"
-#include "mcs/video/displayoutput.h"
-
-#include "mcs/streaming/mpegtspacketizer.h"
-#include "mcs/streaming/rtpsender.h"
-
-#include "mcs/mir/sourcemediamanager.h"
-
-#include "mcs/android/h264encoder.h"
+#include "ac/logger.h"
+#include "ac/keep_alive.h"
+
+#include "ac/common/threadedexecutor.h"
+#include "ac/common/threadedexecutorfactory.h"
+
+#include "ac/network/udpstream.h"
+
+#include "ac/report/reportfactory.h"
+
+#include "ac/video/videoformat.h"
+#include "ac/video/displayoutput.h"
+
+#include "ac/streaming/mpegtspacketizer.h"
+#include "ac/streaming/rtpsender.h"
+
+#include "ac/mir/sourcemediamanager.h"
+
+#include "ac/android/h264encoder.h"
 
 namespace {
 // Number of milliseconds was choosen by measurement
 static constexpr std::chrono::milliseconds kStreamDelayOnPlay{300};
 }
 
-namespace mcs {
+namespace ac {
 namespace mir {
 
 SourceMediaManager::SourceMediaManager(const std::string &remote_address,
-                                       const mcs::common::ExecutorFactory::Ptr &executor_factory,
-                                       const mcs::video::BufferProducer::Ptr &producer,
-                                       const mcs::video::BaseEncoder::Ptr &encoder,
-                                       const mcs::network::Stream::Ptr &output_stream,
-                                       const mcs::report::ReportFactory::Ptr &report_factory) :
+                                       const ac::common::ExecutorFactory::Ptr &executor_factory,
+                                       const ac::video::BufferProducer::Ptr &producer,
+                                       const ac::video::BaseEncoder::Ptr &encoder,
+                                       const ac::network::Stream::Ptr &output_stream,
+                                       const ac::report::ReportFactory::Ptr &report_factory) :
     state_(State::Stopped),
     remote_address_(remote_address),
     producer_(producer),
@@ -65,22 +65,22 @@
 }
 
 bool SourceMediaManager::Configure() {
-    auto rr = mcs::video::ExtractRateAndResolution(format_);
+    auto rr = ac::video::ExtractRateAndResolution(format_);
 
     if (!output_stream_->Connect(remote_address_, sink_port1_))
         return false;
 
-    MCS_DEBUG("dimensions: %dx%d@%d", rr.width, rr.height, rr.framerate);
+    AC_DEBUG("dimensions: %dx%d@%d", rr.width, rr.height, rr.framerate);
 
     video::DisplayOutput output{video::DisplayOutput::Mode::kExtend, rr.width, rr.height, rr.framerate};
 
     if (!producer_->Setup(output)) {
-        MCS_ERROR("Failed to setup buffer producer");
+        AC_ERROR("Failed to setup buffer producer");
         return false;
     }
 
     int profile = 0, level = 0, constraint = 0;
-    mcs::video::ExtractProfileLevel(format_, &profile, &level, &constraint);
+    ac::video::ExtractProfileLevel(format_, &profile, &level, &constraint);
 
     auto config = encoder_->DefaultConfiguration();
     config.width = rr.width;
@@ -91,21 +91,21 @@
     config.constraint_set = constraint;
 
     if (!encoder_->Configure(config)) {
-        MCS_ERROR("Failed to configure encoder");
+        AC_ERROR("Failed to configure encoder");
         return false;
     }
 
-    renderer_ = std::make_shared<mcs::mir::StreamRenderer>(
+    renderer_ = std::make_shared<ac::mir::StreamRenderer>(
                 producer_, encoder_, report_factory_->CreateRendererReport());
 
-    auto rtp_sender = std::make_shared<mcs::streaming::RTPSender>(
+    auto rtp_sender = std::make_shared<ac::streaming::RTPSender>(
                 output_stream_, report_factory_->CreateSenderReport());
     rtp_sender->SetDelegate(shared_from_this());
 
-    const auto mpegts_packetizer = mcs::streaming::MPEGTSPacketizer::Create(
+    const auto mpegts_packetizer = ac::streaming::MPEGTSPacketizer::Create(
                 report_factory_->CreatePacketizerReport());
 
-    sender_ = std::make_shared<mcs::streaming::MediaSender>(
+    sender_ = std::make_shared<ac::streaming::MediaSender>(
                 mpegts_packetizer,
                 rtp_sender,
                 config);
@@ -134,7 +134,7 @@
 }
 
 gboolean SourceMediaManager::OnStartPipeline(gpointer user_data) {
-    auto thiz = static_cast<mcs::WeakKeepAlive<SourceMediaManager>*>(user_data)->GetInstance().lock();
+    auto thiz = static_cast<ac::WeakKeepAlive<SourceMediaManager>*>(user_data)->GetInstance().lock();
     if (!thiz)
         return FALSE;
 
@@ -148,7 +148,7 @@
     if (!IsPaused())
         return;
 
-    MCS_DEBUG("");
+    AC_DEBUG("");
 
     CancelDelayTimeout();
 
@@ -176,7 +176,7 @@
 
     CancelDelayTimeout();
 
-    MCS_DEBUG("");
+    AC_DEBUG("");
 
     pipeline_.Stop();
 
@@ -187,7 +187,7 @@
     if (state_ == State::Stopped)
         return;
 
-    MCS_DEBUG("");
+    AC_DEBUG("");
 
     CancelDelayTimeout();
 
@@ -213,4 +213,4 @@
 }
 
 } // namespace mir
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/mir/sourcemediamanager.h' => 'src/ac/mir/sourcemediamanager.h'
--- src/mcs/mir/sourcemediamanager.h	2016-05-06 13:08:10 +0000
+++ src/ac/mir/sourcemediamanager.h	2016-06-07 08:21:39 +0000
@@ -15,36 +15,36 @@
  *
  */
 
-#ifndef MCS_MIR_SOURCEMEDIAMANAGERNEXT_H_
-#define MCS_MIR_SOURCEMEDIAMANAGERNEXT_H_
+#ifndef AC_MIR_SOURCEMEDIAMANAGERNEXT_H_
+#define AC_MIR_SOURCEMEDIAMANAGERNEXT_H_
 
 #include <memory>
 
-#include "mcs/glib_wrapper.h"
-
-#include "mcs/basesourcemediamanager.h"
-
-#include "mcs/common/executor.h"
-#include "mcs/common/threadedexecutor.h"
-#include "mcs/common/executorpool.h"
-
-#include "mcs/report/reportfactory.h"
-
-#include "mcs/network/stream.h"
-
-#include "mcs/video/baseencoder.h"
-
-#include "mcs/streaming/mediasender.h"
-
-#include "mcs/mir/screencast.h"
-#include "mcs/mir/streamrenderer.h"
-
-namespace mcs {
+#include "ac/glib_wrapper.h"
+
+#include "ac/basesourcemediamanager.h"
+
+#include "ac/common/executor.h"
+#include "ac/common/threadedexecutor.h"
+#include "ac/common/executorpool.h"
+
+#include "ac/report/reportfactory.h"
+
+#include "ac/network/stream.h"
+
+#include "ac/video/baseencoder.h"
+
+#include "ac/streaming/mediasender.h"
+
+#include "ac/mir/screencast.h"
+#include "ac/mir/streamrenderer.h"
+
+namespace ac {
 namespace mir {
 
 class SourceMediaManager : public std::enable_shared_from_this<SourceMediaManager>,
-                           public mcs::BaseSourceMediaManager,
-                           public mcs::streaming::TransportSender::Delegate {
+                           public ac::BaseSourceMediaManager,
+                           public ac::streaming::TransportSender::Delegate {
 public:
     typedef std::shared_ptr<SourceMediaManager> Ptr;
 
@@ -55,11 +55,11 @@
     };
 
     SourceMediaManager(const std::string &remote_address,
-                       const mcs::common::ExecutorFactory::Ptr &executor_factory,
-                       const mcs::video::BufferProducer::Ptr &producer,
-                       const mcs::video::BaseEncoder::Ptr &encoder,
-                       const mcs::network::Stream::Ptr &output_stream,
-                       const mcs::report::ReportFactory::Ptr &report_factory);
+                       const ac::common::ExecutorFactory::Ptr &executor_factory,
+                       const ac::video::BufferProducer::Ptr &producer,
+                       const ac::video::BaseEncoder::Ptr &encoder,
+                       const ac::network::Stream::Ptr &output_stream,
+                       const ac::report::ReportFactory::Ptr &report_factory);
 
     ~SourceMediaManager();
 
@@ -85,17 +85,17 @@
 private:
     State state_;
     std::string remote_address_;
-    mcs::video::BufferProducer::Ptr producer_;
-    mcs::video::BaseEncoder::Ptr encoder_;
-    mcs::network::Stream::Ptr output_stream_;
-    mcs::report::ReportFactory::Ptr report_factory_;
-    mcs::mir::StreamRenderer::Ptr renderer_;
-    mcs::streaming::MediaSender::Ptr sender_;
-    mcs::common::ExecutorPool pipeline_;
+    ac::video::BufferProducer::Ptr producer_;
+    ac::video::BaseEncoder::Ptr encoder_;
+    ac::network::Stream::Ptr output_stream_;
+    ac::report::ReportFactory::Ptr report_factory_;
+    ac::mir::StreamRenderer::Ptr renderer_;
+    ac::streaming::MediaSender::Ptr sender_;
+    ac::common::ExecutorPool pipeline_;
     guint delay_timeout_;
 };
 
 } // namespace mir
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/mir/streamrenderer.cpp' => 'src/ac/mir/streamrenderer.cpp'
--- src/mcs/mir/streamrenderer.cpp	2016-03-30 08:13:42 +0000
+++ src/ac/mir/streamrenderer.cpp	2016-06-07 08:21:39 +0000
@@ -20,17 +20,17 @@
 
 #include <boost/concept_check.hpp>
 
-#include "mcs/logger.h"
+#include "ac/logger.h"
 
-#include "mcs/mir/screencast.h"
-#include "mcs/mir/streamrenderer.h"
+#include "ac/mir/screencast.h"
+#include "ac/mir/streamrenderer.h"
 
 namespace {
 static constexpr const char *kStreamRendererThreadName{"StreamRenderer"};
 static constexpr unsigned int kNumBufferSlots{2};
 }
 
-namespace mcs {
+namespace ac {
 namespace mir {
 
 StreamRenderer::StreamRenderer(const video::BufferProducer::Ptr &buffer_producer,
@@ -41,7 +41,7 @@
     encoder_(encoder),
     width_(buffer_producer->OutputMode().width),
     height_(buffer_producer->OutputMode().height),
-    input_buffers_(mcs::video::BufferQueue::Create(BufferSlots())),
+    input_buffers_(ac::video::BufferQueue::Create(BufferSlots())),
     target_iteration_time_((1. / encoder_->Configuration().framerate) * std::micro::den) {
 }
 
@@ -50,7 +50,7 @@
 }
 
 bool StreamRenderer::Execute() {
-    mcs::TimestampUs iteration_start_time = mcs::Utils::GetNowUs();
+    ac::TimestampUs iteration_start_time = ac::Utils::GetNowUs();
 
     // Wait until we have free slots again and all buffers we produced
     // went through the pipeline.
@@ -65,13 +65,13 @@
 
     const auto native_buffer = buffer_producer_->CurrentBuffer();
 
-    auto buffer = mcs::video::Buffer::Create(native_buffer);
+    auto buffer = ac::video::Buffer::Create(native_buffer);
     buffer->SetDelegate(shared_from_this());
 
     // FIXME: at optimum we would get the timestamp directly supplied
     // from our producer but as long as that isn't available we don't
     // have any other chance and need to do it here.
-    buffer->SetTimestamp(mcs::Utils::GetNowUs());
+    buffer->SetTimestamp(ac::Utils::GetNowUs());
 
     input_buffers_->Push(buffer);
 
@@ -81,8 +81,8 @@
 
     // Calculate how long we have to wait until we can render the next
     // frame to keep our framerate constant.
-    mcs::TimestampUs iteration_time = mcs::Utils::GetNowUs() - iteration_start_time;
-    mcs::TimestampUs sleep_time = target_iteration_time_ - iteration_time;
+    ac::TimestampUs iteration_time = ac::Utils::GetNowUs() - iteration_start_time;
+    ac::TimestampUs sleep_time = target_iteration_time_ - iteration_time;
     if (sleep_time > 0)
         std::this_thread::sleep_for(std::chrono::microseconds(sleep_time));
 
@@ -100,7 +100,7 @@
 }
 
 bool StreamRenderer::Start() {
-    MCS_DEBUG("Everything successfully setup; Starting recording now %dx%d@%d",
+    AC_DEBUG("Everything successfully setup; Starting recording now %dx%d@%d",
               width_, height_, encoder_->Configuration().framerate);
 
     return true;
@@ -119,4 +119,4 @@
 }
 
 } // namespace mir
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/mir/streamrenderer.h' => 'src/ac/mir/streamrenderer.h'
--- src/mcs/mir/streamrenderer.h	2016-03-17 09:23:29 +0000
+++ src/ac/mir/streamrenderer.h	2016-06-07 08:21:39 +0000
@@ -15,29 +15,29 @@
  *
  */
 
-#ifndef MCS_MIR_STREAMRENDERER_H_
-#define MCS_MIR_STREAMRENDERER_H_
+#ifndef AC_MIR_STREAMRENDERER_H_
+#define AC_MIR_STREAMRENDERER_H_
 
 #include <memory>
 #include <thread>
 #include <mutex>
 #include <queue>
 
-#include "mcs/common/executable.h"
-
-#include "mcs/mir/streamrenderer.h"
-#include "mcs/mir/screencast.h"
-
-#include "mcs/video/baseencoder.h"
-#include "mcs/video/bufferqueue.h"
-#include "mcs/video/bufferproducer.h"
-#include "mcs/video/rendererreport.h"
-
-namespace mcs {
+#include "ac/common/executable.h"
+
+#include "ac/mir/streamrenderer.h"
+#include "ac/mir/screencast.h"
+
+#include "ac/video/baseencoder.h"
+#include "ac/video/bufferqueue.h"
+#include "ac/video/bufferproducer.h"
+#include "ac/video/rendererreport.h"
+
+namespace ac {
 namespace mir {
 class StreamRenderer : public std::enable_shared_from_this<StreamRenderer>,
-                       public mcs::common::Executable,
-                       public mcs::video::Buffer::Delegate {
+                       public ac::common::Executable,
+                       public ac::video::Buffer::Delegate {
 public:
     static constexpr unsigned int kNumTextures{2};
 
@@ -50,10 +50,10 @@
 
     std::uint32_t BufferSlots() const;
 
-    // From mcs::video::Buffer::Delegate
-    void OnBufferFinished(const mcs::video::Buffer::Ptr &buffer);
+    // From ac::video::Buffer::Delegate
+    void OnBufferFinished(const ac::video::Buffer::Ptr &buffer);
 
-    // From mcs::common::Executable
+    // From ac::common::Executable
     bool Start() override;
     bool Stop() override;
     bool Execute() override;
@@ -65,10 +65,10 @@
     video::BaseEncoder::Ptr encoder_;
     unsigned int width_;
     unsigned int height_;
-    mcs::video::BufferQueue::Ptr input_buffers_;
-    mcs::TimestampUs target_iteration_time_;
+    ac::video::BufferQueue::Ptr input_buffers_;
+    ac::TimestampUs target_iteration_time_;
 };
 } // namespace mir
-} // namespace mcs
+} // namespace ac
 
 #endif

=== added directory 'src/ac/network'
=== renamed file 'src/mcs/network/stream.cpp' => 'src/ac/network/stream.cpp'
--- src/mcs/network/stream.cpp	2016-04-22 08:17:23 +0000
+++ src/ac/network/stream.cpp	2016-06-07 08:21:39 +0000
@@ -15,4 +15,4 @@
  *
  */
 
-#include "mcs/network/stream.h"
+#include "ac/network/stream.h"

=== renamed file 'src/mcs/network/stream.h' => 'src/ac/network/stream.h'
--- src/mcs/network/stream.h	2016-05-10 12:04:37 +0000
+++ src/ac/network/stream.h	2016-06-07 08:21:39 +0000
@@ -15,20 +15,20 @@
  *
  */
 
-#ifndef MCS_NETWORK_STREAM_H_
-#define MCS_NETWORK_STREAM_H_
+#ifndef AC_NETWORK_STREAM_H_
+#define AC_NETWORK_STREAM_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/network/types.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/network/types.h"
+
+namespace ac {
 namespace network {
 
-class Stream : public mcs::NonCopyable {
+class Stream : public ac::NonCopyable {
 public:
     typedef std::shared_ptr<Stream> Ptr;
 
@@ -41,7 +41,7 @@
     virtual bool Connect(const std::string &address, const Port &port) = 0;
 
     virtual Error Write(const uint8_t *data, unsigned int size,
-                        const mcs::TimestampUs &timestamp = 0) = 0;
+                        const ac::TimestampUs &timestamp = 0) = 0;
 
     virtual Port LocalPort() const = 0;
 
@@ -56,6 +56,6 @@
 };
 
 } // namespace network
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/network/types.h' => 'src/ac/network/types.h'
--- src/mcs/network/types.h	2016-03-10 13:53:16 +0000
+++ src/ac/network/types.h	2016-06-07 08:21:39 +0000
@@ -15,17 +15,17 @@
  *
  */
 
-#ifndef MCS_NETWORK_TYPES_H_
-#define MCS_NETWORK_TYPES_H_
+#ifndef AC_NETWORK_TYPES_H_
+#define AC_NETWORK_TYPES_H_
 
 #include <cstdint>
 
-namespace mcs {
+namespace ac {
 namespace network {
 
 typedef std::uint16_t Port;
 
 } // namespace network
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/network/udpstream.cpp' => 'src/ac/network/udpstream.cpp'
--- src/mcs/network/udpstream.cpp	2016-05-10 12:04:37 +0000
+++ src/ac/network/udpstream.cpp	2016-06-07 08:21:39 +0000
@@ -31,10 +31,10 @@
 
 #include <boost/concept_check.hpp>
 
-#include "mcs/logger.h"
-#include "mcs/networkutils.h"
+#include "ac/logger.h"
+#include "ac/networkutils.h"
 
-#include "mcs/network/udpstream.h"
+#include "ac/network/udpstream.h"
 
 namespace {
 static constexpr unsigned int kUdpTxBufferSize = 256 * 1024;
@@ -42,7 +42,7 @@
 static constexpr unsigned int kMaxUDPPacketSize = 1472;
 }
 
-namespace mcs {
+namespace ac {
 namespace network {
 
 UdpStream::UdpStream() :
@@ -56,17 +56,17 @@
 }
 
 bool UdpStream::Connect(const std::string &address, const Port &port) {
-    MCS_DEBUG("Connected with remote on %s:%d", address, port);
+    AC_DEBUG("Connected with remote on %s:%d", address, port);
 
     socket_ = ::socket(AF_INET, SOCK_DGRAM, 0);
     if (socket_ < 0) {
-        MCS_ERROR("Failed to create socket: %s (%d)", ::strerror(errno), errno);
+        AC_ERROR("Failed to create socket: %s (%d)", ::strerror(errno), errno);
         return false;
     }
 
     int value = kUdpTxBufferSize;
     if (::setsockopt(socket_, SOL_SOCKET, SO_SNDBUF, &value, sizeof(value)) < 0) {
-        MCS_ERROR("Failed to set socket transmit buffer size: %s (%d)", ::strerror(errno), errno);
+        AC_ERROR("Failed to set socket transmit buffer size: %s (%d)", ::strerror(errno), errno);
         return false;
     }
 
@@ -77,7 +77,7 @@
     addr.sin_port = htons(local_port_);
 
     if (::bind(socket_, reinterpret_cast<const struct sockaddr*>(&addr), sizeof(addr)) < 0) {
-        MCS_ERROR("Failed to bind socket to address: %s (%d)", ::strerror(errno), errno);
+        AC_ERROR("Failed to bind socket to address: %s (%d)", ::strerror(errno), errno);
         return false;
     }
 
@@ -88,14 +88,14 @@
 
     struct hostent *ent = gethostbyname(address.c_str());
     if (!ent) {
-        MCS_ERROR("Failed to resolve remote address");
+        AC_ERROR("Failed to resolve remote address");
         return false;
     }
 
     remote_addr.sin_addr.s_addr = *(in_addr_t*) ent->h_addr;
 
     if (::connect(socket_, reinterpret_cast<const struct sockaddr*>(&remote_addr), sizeof(remote_addr)) < 0) {
-        MCS_ERROR("Failed to connect to remote: %s (%d)", ::strerror(errno), errno);
+        AC_ERROR("Failed to connect to remote: %s (%d)", ::strerror(errno), errno);
         return false;
     }
 
@@ -103,7 +103,7 @@
 }
 
 Stream::Error UdpStream::Write(const uint8_t *data, unsigned int size,
-                               const mcs::TimestampUs &timestamp) {
+                               const ac::TimestampUs &timestamp) {
 
     boost::ignore_unused_variable_warning(timestamp);
 
@@ -123,7 +123,7 @@
         case EHOSTUNREACH:
         case ENETUNREACH:
         case ENETDOWN:
-            MCS_DEBUG("Trying to resend due to a possible congested socket (errno %d)", errno);
+            AC_DEBUG("Trying to resend due to a possible congested socket (errno %d)", errno);
             bytes_sent = ::send(socket_, data, size, 0);
            break;
         default:
@@ -132,11 +132,11 @@
     }
 
     if (bytes_sent < 0) {
-        MCS_ERROR("Failed to send packet to remote: %s (%d)", ::strerror(-errno), errno);
+        AC_ERROR("Failed to send packet to remote: %s (%d)", ::strerror(-errno), errno);
         return Error::kFailed;
     }
     else if (bytes_sent == 0) {
-        MCS_ERROR("Remote has closed connection: %s (%d)", ::strerror(-errno), errno);
+        AC_ERROR("Remote has closed connection: %s (%d)", ::strerror(-errno), errno);
         return Error::kRemoteClosedConnection;
     }
 
@@ -152,4 +152,4 @@
 }
 
 } // namespace network
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/network/udpstream.h' => 'src/ac/network/udpstream.h'
--- src/mcs/network/udpstream.h	2016-05-10 12:04:37 +0000
+++ src/ac/network/udpstream.h	2016-06-07 08:21:39 +0000
@@ -15,16 +15,16 @@
  *
  */
 
-#ifndef MCS_NETWORK_UDPSTREAM_H_
-#define MCS_NETWORK_UDPSTREAM_H_
+#ifndef AC_NETWORK_UDPSTREAM_H_
+#define AC_NETWORK_UDPSTREAM_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-
-#include "mcs/network/stream.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+
+#include "ac/network/stream.h"
+
+namespace ac {
 namespace network {
 
 class UdpStream : public Stream {
@@ -35,7 +35,7 @@
     bool Connect(const std::string &address, const Port &port) override;
 
     Error Write(const uint8_t *data, unsigned int size,
-                const mcs::TimestampUs &timestamp = 0) override;
+                const ac::TimestampUs &timestamp = 0) override;
 
     Port LocalPort() const override;
 
@@ -47,6 +47,6 @@
 };
 
 } // namespace network
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/networkdevice.cpp' => 'src/ac/networkdevice.cpp'
--- src/mcs/networkdevice.cpp	2016-01-16 13:33:12 +0000
+++ src/ac/networkdevice.cpp	2016-06-07 08:21:39 +0000
@@ -17,7 +17,7 @@
 
 #include "networkdevice.h"
 
-namespace mcs {
+namespace ac {
 std::string NetworkDevice::StateToStr(NetworkDeviceState state) {
     switch (state) {
     case kIdle:
@@ -56,4 +56,4 @@
     return State() == kConfiguration ||
             State() == kAssociation;
 }
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/networkdevice.h' => 'src/ac/networkdevice.h'
--- src/mcs/networkdevice.h	2015-12-16 08:04:35 +0000
+++ src/ac/networkdevice.h	2016-06-07 08:21:39 +0000
@@ -26,7 +26,7 @@
 #include "mac_address.h"
 #include "non_copyable.h"
 
-namespace mcs {
+namespace ac {
 enum NetworkDeviceState {
     kIdle,
     kFailure,
@@ -59,5 +59,5 @@
 protected:
     NetworkDevice() = default;
 };
-} // namespace mcs
+} // namespace ac
 #endif

=== renamed file 'src/mcs/networkmanager.cpp' => 'src/ac/networkmanager.cpp'
--- src/mcs/networkmanager.cpp	2016-01-21 13:25:31 +0000
+++ src/ac/networkmanager.cpp	2016-06-07 08:21:39 +0000
@@ -17,7 +17,7 @@
 
 #include "networkmanager.h"
 
-namespace mcs {
+namespace ac {
 std::string NetworkManager::CapabilityToStr(Capability capability) {
     if (capability == Capability::kSink)
         return "sink";
@@ -25,4 +25,4 @@
         return "source";
     return "";
 }
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/networkmanager.h' => 'src/ac/networkmanager.h'
--- src/mcs/networkmanager.h	2016-04-27 07:37:30 +0000
+++ src/ac/networkmanager.h	2016-06-07 08:21:39 +0000
@@ -28,12 +28,12 @@
 #include "networkdevice.h"
 #include "non_copyable.h"
 
-namespace mcs {
-class NetworkManager : private mcs::NonCopyable {
+namespace ac {
+class NetworkManager : private ac::NonCopyable {
 public:
     typedef std::shared_ptr<NetworkManager> Ptr;
 
-    class Delegate : private mcs::NonCopyable {
+    class Delegate : private ac::NonCopyable {
     public:
         virtual void OnDeviceFound(const NetworkDevice::Ptr &peer) = 0;
         virtual void OnDeviceLost(const NetworkDevice::Ptr &peer) = 0;
@@ -74,5 +74,5 @@
 protected:
     NetworkManager() = default;
 };
-} // namespace mcs
+} // namespace ac
 #endif

=== renamed file 'src/mcs/networkmanagerfactory.cpp' => 'src/ac/networkmanagerfactory.cpp'
--- src/mcs/networkmanagerfactory.cpp	2016-04-27 07:37:30 +0000
+++ src/ac/networkmanagerfactory.cpp	2016-06-07 08:21:39 +0000
@@ -24,62 +24,62 @@
 #include "logger.h"
 #include "utils.h"
 
-namespace mcs {
+namespace ac {
 
 void NullNetworkManager::SetDelegate(Delegate * delegate) {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
 }
 
 bool NullNetworkManager::Setup() {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
     return false;
 }
 
 void NullNetworkManager::Release() {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
 }
 
 void NullNetworkManager::Scan(const std::chrono::seconds &timeout) {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
 }
 
 bool NullNetworkManager::Connect(const NetworkDevice::Ptr &device) {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
     return false;
 }
 
 bool NullNetworkManager::Disconnect(const NetworkDevice::Ptr &device) {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
     return false;
 }
 
 std::vector<NetworkDevice::Ptr> NullNetworkManager::Devices() const {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
     return std::vector<NetworkDevice::Ptr>();
 }
 
 IpV4Address NullNetworkManager::LocalAddress() const {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
     return IpV4Address();
 }
 
 bool NullNetworkManager::Running() const {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
     return false;
 }
 
 bool NullNetworkManager::Scanning() const {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
     return false;
 }
 
 bool NullNetworkManager::Ready() const {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
     return false;
 }
 
 void NullNetworkManager::SetCapabilities(const std::vector<Capability> &capabilities) {
-    ERROR("Not implemented");
+    AC_ERROR("Not implemented");
 }
 
 std::vector<NetworkManager::Capability> NullNetworkManager::Capabilities() const {
@@ -89,7 +89,7 @@
 NetworkManager::Ptr NetworkManagerFactory::Create(const std::string &type) {
     auto final_type = type.length() > 0 ? type : Utils::GetEnvValue("AETHERCAST_NETWORK_MANAGER");
 
-    DEBUG("Creating network manager of type %s", final_type.length() > 0 ? final_type : "w11tng");
+    AC_DEBUG("Creating network manager of type %s", final_type.length() > 0 ? final_type : "w11tng");
 
     // We will always default to the w11t implementation if no invalid
     // type is specified.
@@ -99,4 +99,4 @@
     return std::make_shared<NullNetworkManager>();
 }
 
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/networkmanagerfactory.h' => 'src/ac/networkmanagerfactory.h'
--- src/mcs/networkmanagerfactory.h	2016-04-27 07:37:30 +0000
+++ src/ac/networkmanagerfactory.h	2016-06-07 08:21:39 +0000
@@ -20,10 +20,10 @@
 
 #include "networkmanager.h"
 
-namespace mcs {
+namespace ac {
 
 // Only here to make unit testing easier for the factory class
-class NullNetworkManager : public mcs::NetworkManager {
+class NullNetworkManager : public ac::NetworkManager {
 public:
     void SetDelegate(Delegate * delegate) override;
 
@@ -49,6 +49,6 @@
     static NetworkManager::Ptr Create(const std::string &type = "");
 };
 
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/networkutils.cpp' => 'src/ac/networkutils.cpp'
--- src/mcs/networkutils.cpp	2016-05-10 12:04:37 +0000
+++ src/ac/networkutils.cpp	2016-06-07 08:21:39 +0000
@@ -40,10 +40,10 @@
 
 #include <random>
 
-#include "mcs/glib_wrapper.h"
-#include "mcs/logger.h"
-#include "mcs/networkutils.h"
-#include "mcs/logger.h"
+#include "ac/glib_wrapper.h"
+#include "ac/logger.h"
+#include "ac/networkutils.h"
+#include "ac/logger.h"
 
 namespace {
 static constexpr size_t kDriverCommandReplySize{1024};
@@ -73,7 +73,7 @@
 }
 }
 
-namespace mcs {
+namespace ac {
 const network::Port NetworkUtils::kMinUserPort{1024};
 const network::Port NetworkUtils::kMaxUserPort{65534};
 
@@ -262,7 +262,7 @@
     addr = (struct sockaddr_in *)&addr_ifr.ifr_addr;
     addr->sin_family = AF_INET;
     if (ioctl(sk, SIOCSIFADDR, &addr_ifr) < 0)
-        WARNING("Could not clear IPv4 address of interface with index %d", index);
+        AC_WARNING("Could not clear IPv4 address of interface with index %d", index);
 
 done:
     close(sk);
@@ -320,11 +320,11 @@
     return ret;
 }
 
-mcs::network::Port NetworkUtils::PickRandomPort() {
+ac::network::Port NetworkUtils::PickRandomPort() {
     std::random_device rd;
     std::mt19937 generator(rd());
     std::uniform_int_distribution<> distribution(kMinUserPort, kMaxUserPort);
-    return static_cast<mcs::network::Port>(distribution(generator));
+    return static_cast<ac::network::Port>(distribution(generator));
 }
 
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/networkutils.h' => 'src/ac/networkutils.h'
--- src/mcs/networkutils.h	2016-05-10 12:04:37 +0000
+++ src/ac/networkutils.h	2016-06-07 08:21:39 +0000
@@ -20,14 +20,14 @@
 
 #include <string>
 
-#include "mcs/network/types.h"
+#include "ac/network/types.h"
 
-namespace mcs {
+namespace ac {
 class NetworkUtils
 {
 public:
-    static const mcs::network::Port kMinUserPort;
-    static const mcs::network::Port kMaxUserPort;
+    static const ac::network::Port kMinUserPort;
+    static const ac::network::Port kMaxUserPort;
 
     static int RetrieveInterfaceIndex(const char *name);
     static std::string RetrieveInterfaceName(int index);
@@ -37,7 +37,7 @@
     static int ResetInterface(int index);
     static int BytesAvailableToRead(int fd);
     static int SendDriverPrivateCommand(const std::string &ifname, const std::string &cmd);
-    static mcs::network::Port PickRandomPort();
+    static ac::network::Port PickRandomPort();
 };
-} // namespace mcs
+} // namespace ac
 #endif

=== renamed file 'src/mcs/non_copyable.h' => 'src/ac/non_copyable.h'
--- src/mcs/non_copyable.h	2015-12-01 08:42:48 +0000
+++ src/ac/non_copyable.h	2016-06-07 08:21:39 +0000
@@ -18,7 +18,7 @@
 #ifndef NON_COPYABLE_H_
 #define NON_COPYABLE_H_
 
-namespace mcs {
+namespace ac {
 // The alert reader might wonder why we don't use boost::noncopyable. The reason
 // is simple: We would like to have a convenient virtual d'tor available.
 struct NonCopyable {

=== added directory 'src/ac/report'
=== added directory 'src/ac/report/logging'
=== renamed file 'src/mcs/report/logging/encoderreport.cpp' => 'src/ac/report/logging/encoderreport.cpp'
--- src/mcs/report/logging/encoderreport.cpp	2016-03-08 08:48:09 +0000
+++ src/ac/report/logging/encoderreport.cpp	2016-06-07 08:21:39 +0000
@@ -15,34 +15,34 @@
  *
  */
 
-#include "mcs/logger.h"
-
-#include "mcs/report/logging/encoderreport.h"
-
-namespace mcs {
+#include "ac/logger.h"
+
+#include "ac/report/logging/encoderreport.h"
+
+namespace ac {
 namespace report {
 namespace logging {
 
 void EncoderReport::Started() {
-    MCS_TRACE("");
+    AC_TRACE("");
 }
 
 void EncoderReport::Stopped() {
-    MCS_TRACE("");
-}
-
-void EncoderReport::BeganFrame(const mcs::TimestampUs &timestamp) {
-    MCS_TRACE("timestamp %lld", timestamp);
-}
-
-void EncoderReport::FinishedFrame(const mcs::TimestampUs &timestamp) {
-    MCS_TRACE("timestamp %lld", timestamp);
-}
-
-void EncoderReport::ReceivedInputBuffer(const mcs::TimestampUs &timestamp) {
-    MCS_TRACE("timestamp %lld", timestamp);
+    AC_TRACE("");
+}
+
+void EncoderReport::BeganFrame(const ac::TimestampUs &timestamp) {
+    AC_TRACE("timestamp %lld", timestamp);
+}
+
+void EncoderReport::FinishedFrame(const ac::TimestampUs &timestamp) {
+    AC_TRACE("timestamp %lld", timestamp);
+}
+
+void EncoderReport::ReceivedInputBuffer(const ac::TimestampUs &timestamp) {
+    AC_TRACE("timestamp %lld", timestamp);
 }
 
 } // namespace logging
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/logging/encoderreport.h' => 'src/ac/report/logging/encoderreport.h'
--- src/mcs/report/logging/encoderreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/logging/encoderreport.h	2016-06-07 08:21:39 +0000
@@ -15,17 +15,17 @@
  *
  */
 
-#ifndef MCS_REPORT_LOGGING_ENCODERREPORT_H_
-#define MCS_REPORT_LOGGING_ENCODERREPORT_H_
+#ifndef AC_REPORT_LOGGING_ENCODERREPORT_H_
+#define AC_REPORT_LOGGING_ENCODERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/video/encoderreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/video/encoderreport.h"
+
+namespace ac {
 namespace report {
 namespace logging {
 
@@ -33,13 +33,13 @@
 public:
     void Started();
     void Stopped();
-    void BeganFrame(const mcs::TimestampUs &timestamp);
-    void FinishedFrame(const mcs::TimestampUs &timestamp);
-    void ReceivedInputBuffer(const mcs::TimestampUs &timestamp);
+    void BeganFrame(const ac::TimestampUs &timestamp);
+    void FinishedFrame(const ac::TimestampUs &timestamp);
+    void ReceivedInputBuffer(const ac::TimestampUs &timestamp);
 };
 
 } // namespace logging
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/logging/loggingreportfactory.cpp' => 'src/ac/report/logging/loggingreportfactory.cpp'
--- src/mcs/report/logging/loggingreportfactory.cpp	2016-03-07 11:28:32 +0000
+++ src/ac/report/logging/loggingreportfactory.cpp	2016-06-07 08:21:39 +0000
@@ -15,13 +15,13 @@
  *
  */
 
-#include "mcs/report/logging/loggingreportfactory.h"
-#include "mcs/report/logging/encoderreport.h"
-#include "mcs/report/logging/rendererreport.h"
-#include "mcs/report/logging/packetizerreport.h"
-#include "mcs/report/logging/senderreport.h"
+#include "ac/report/logging/loggingreportfactory.h"
+#include "ac/report/logging/encoderreport.h"
+#include "ac/report/logging/rendererreport.h"
+#include "ac/report/logging/packetizerreport.h"
+#include "ac/report/logging/senderreport.h"
 
-namespace mcs {
+namespace ac {
 namespace report {
 
 std::shared_ptr<video::EncoderReport> LoggingReportFactory::CreateEncoderReport() {
@@ -41,4 +41,4 @@
 }
 
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/logging/loggingreportfactory.h' => 'src/ac/report/logging/loggingreportfactory.h'
--- src/mcs/report/logging/loggingreportfactory.h	2016-03-07 11:28:32 +0000
+++ src/ac/report/logging/loggingreportfactory.h	2016-06-07 08:21:39 +0000
@@ -15,16 +15,16 @@
  *
  */
 
-#ifndef MCS_REPORT_LOGGINGREPORTFACTORY_H_
-#define MCS_REPORT_LOGGINGREPORTFACTORY_H_
+#ifndef AC_REPORT_LOGGINGREPORTFACTORY_H_
+#define AC_REPORT_LOGGINGREPORTFACTORY_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-
-#include "mcs/report/reportfactory.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+
+#include "ac/report/reportfactory.h"
+
+namespace ac {
 namespace report {
 
 class LoggingReportFactory : public ReportFactory {
@@ -36,6 +36,6 @@
 };
 
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/logging/packetizerreport.cpp' => 'src/ac/report/logging/packetizerreport.cpp'
--- src/mcs/report/logging/packetizerreport.cpp	2016-03-08 08:48:09 +0000
+++ src/ac/report/logging/packetizerreport.cpp	2016-06-07 08:21:39 +0000
@@ -15,18 +15,18 @@
  *
  */
 
-#include "mcs/logger.h"
-
-#include "mcs/report/logging/packetizerreport.h"
-
-namespace mcs {
+#include "ac/logger.h"
+
+#include "ac/report/logging/packetizerreport.h"
+
+namespace ac {
 namespace report {
 namespace logging {
 
 void PacketizerReport::PacketizedFrame(const TimestampUs &timestamp) {
-    MCS_TRACE("timestamp %lld", timestamp);
+    AC_TRACE("timestamp %lld", timestamp);
 }
 
 } // namespace logging
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/logging/packetizerreport.h' => 'src/ac/report/logging/packetizerreport.h'
--- src/mcs/report/logging/packetizerreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/logging/packetizerreport.h	2016-06-07 08:21:39 +0000
@@ -15,27 +15,27 @@
  *
  */
 
-#ifndef MCS_REPORT_LOGGING_PACKETIZERREPORT_H_
-#define MCS_REPORT_LOGGING_PACKETIZERREPORT_H_
+#ifndef AC_REPORT_LOGGING_PACKETIZERREPORT_H_
+#define AC_REPORT_LOGGING_PACKETIZERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/video/packetizerreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/video/packetizerreport.h"
+
+namespace ac {
 namespace report {
 namespace logging {
 
 class PacketizerReport : public video::PacketizerReport {
 public:
-     void PacketizedFrame(const mcs::TimestampUs &timestamp);
+     void PacketizedFrame(const ac::TimestampUs &timestamp);
 };
 
 } // namespace logging
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/logging/rendererreport.cpp' => 'src/ac/report/logging/rendererreport.cpp'
--- src/mcs/report/logging/rendererreport.cpp	2016-03-08 08:48:09 +0000
+++ src/ac/report/logging/rendererreport.cpp	2016-06-07 08:21:39 +0000
@@ -15,11 +15,11 @@
  *
  */
 
-#include "mcs/logger.h"
-
-#include "mcs/report/logging/rendererreport.h"
-
-namespace mcs {
+#include "ac/logger.h"
+
+#include "ac/report/logging/rendererreport.h"
+
+namespace ac {
 namespace report {
 namespace logging {
 
@@ -27,9 +27,9 @@
 }
 
 void RendererReport::FinishedFrame(const TimestampUs &timestamp) {
-    MCS_TRACE("timestamp %lld", timestamp);
+    AC_TRACE("timestamp %lld", timestamp);
 }
 
 } // namespace logging
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/logging/rendererreport.h' => 'src/ac/report/logging/rendererreport.h'
--- src/mcs/report/logging/rendererreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/logging/rendererreport.h	2016-06-07 08:21:39 +0000
@@ -15,28 +15,28 @@
  *
  */
 
-#ifndef MCS_REPORT_LOGGING_RENDERERREPORT_H_
-#define MCS_REPORT_LOGGING_RENDERERREPORT_H_
+#ifndef AC_REPORT_LOGGING_RENDERERREPORT_H_
+#define AC_REPORT_LOGGING_RENDERERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/video/rendererreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/video/rendererreport.h"
+
+namespace ac {
 namespace report {
 namespace logging {
 
 class RendererReport : public video::RendererReport {
 public:
      void BeganFrame();
-     void FinishedFrame(const mcs::TimestampUs &timestamp);
+     void FinishedFrame(const ac::TimestampUs &timestamp);
 };
 
 } // namespace logging
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/logging/senderreport.cpp' => 'src/ac/report/logging/senderreport.cpp'
--- src/mcs/report/logging/senderreport.cpp	2016-03-08 08:48:09 +0000
+++ src/ac/report/logging/senderreport.cpp	2016-06-07 08:21:39 +0000
@@ -15,18 +15,18 @@
  *
  */
 
-#include "mcs/logger.h"
-
-#include "mcs/report/logging/senderreport.h"
-
-namespace mcs {
+#include "ac/logger.h"
+
+#include "ac/report/logging/senderreport.h"
+
+namespace ac {
 namespace report {
 namespace logging {
 
 void SenderReport::SentPacket(const TimestampUs &timestamp, const size_t &size) {
-    MCS_TRACE("timestamp %lld size %d", timestamp, size);
+    AC_TRACE("timestamp %lld size %d", timestamp, size);
 }
 
 } // namespace logging
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/logging/senderreport.h' => 'src/ac/report/logging/senderreport.h'
--- src/mcs/report/logging/senderreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/logging/senderreport.h	2016-06-07 08:21:39 +0000
@@ -15,27 +15,27 @@
  *
  */
 
-#ifndef MCS_REPORT_LOGGING_SENDERREPORT_H_
-#define MCS_REPORT_LOGGING_SENDERREPORT_H_
+#ifndef AC_REPORT_LOGGING_SENDERREPORT_H_
+#define AC_REPORT_LOGGING_SENDERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/video/senderreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/video/senderreport.h"
+
+namespace ac {
 namespace report {
 namespace logging {
 
 class SenderReport : public video::SenderReport {
 public:
-    void SentPacket(const mcs::TimestampUs &timestamp, const size_t &size);
+    void SentPacket(const ac::TimestampUs &timestamp, const size_t &size);
 };
 
 } // namespace logging
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== added directory 'src/ac/report/lttng'
=== renamed file 'src/mcs/report/lttng/encoderreport.cpp' => 'src/ac/report/lttng/encoderreport.cpp'
--- src/mcs/report/lttng/encoderreport.cpp	2016-03-08 08:48:09 +0000
+++ src/ac/report/lttng/encoderreport.cpp	2016-06-07 08:21:39 +0000
@@ -15,36 +15,36 @@
  *
  */
 
-#include "mcs/report/lttng/encoderreport.h"
+#include "ac/report/lttng/encoderreport.h"
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
-#include "mcs/report/lttng/encoderreport_tp.h"
+#include "ac/report/lttng/encoderreport_tp.h"
 
-namespace mcs {
+namespace ac {
 namespace report {
 namespace lttng {
 
 void EncoderReport::Started() {
-    mcs_tracepoint(aethercast_encoder, started, 0);
+    ac_tracepoint(aethercast_encoder, started, 0);
 }
 
 void EncoderReport::Stopped() {
-    mcs_tracepoint(aethercast_encoder, stopped, 0);
-}
-
-void EncoderReport::BeganFrame(const mcs::TimestampUs &timestamp) {
-    mcs_tracepoint(aethercast_encoder, began_frame, timestamp);
-}
-
-void EncoderReport::FinishedFrame(const mcs::TimestampUs &timestamp) {
-    mcs_tracepoint(aethercast_encoder, finished_frame, timestamp);
-}
-
-void EncoderReport::ReceivedInputBuffer(const mcs::TimestampUs &timestamp) {
-    mcs_tracepoint(aethercast_encoder, received_input_buffer, timestamp);
+    ac_tracepoint(aethercast_encoder, stopped, 0);
+}
+
+void EncoderReport::BeganFrame(const ac::TimestampUs &timestamp) {
+    ac_tracepoint(aethercast_encoder, began_frame, timestamp);
+}
+
+void EncoderReport::FinishedFrame(const ac::TimestampUs &timestamp) {
+    ac_tracepoint(aethercast_encoder, finished_frame, timestamp);
+}
+
+void EncoderReport::ReceivedInputBuffer(const ac::TimestampUs &timestamp) {
+    ac_tracepoint(aethercast_encoder, received_input_buffer, timestamp);
 }
 
 } // namespace logging
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/lttng/encoderreport.h' => 'src/ac/report/lttng/encoderreport.h'
--- src/mcs/report/lttng/encoderreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/lttng/encoderreport.h	2016-06-07 08:21:39 +0000
@@ -15,18 +15,18 @@
  *
  */
 
-#ifndef MCS_REPORT_LTTNG_ENCODERREPORT_H_
-#define MCS_REPORT_LTTNG_ENCODERREPORT_H_
+#ifndef AC_REPORT_LTTNG_ENCODERREPORT_H_
+#define AC_REPORT_LTTNG_ENCODERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-
-#include "mcs/video/encoderreport.h"
-
-#include "mcs/report/lttng/tracepointprovider.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+
+#include "ac/video/encoderreport.h"
+
+#include "ac/report/lttng/tracepointprovider.h"
+
+namespace ac {
 namespace report {
 namespace lttng {
 
@@ -34,9 +34,9 @@
 public:
     void Started();
     void Stopped();
-    void BeganFrame(const mcs::TimestampUs &timestamp);
-    void FinishedFrame(const mcs::TimestampUs &timestamp);
-    void ReceivedInputBuffer(const mcs::TimestampUs &timestamp);
+    void BeganFrame(const ac::TimestampUs &timestamp);
+    void FinishedFrame(const ac::TimestampUs &timestamp);
+    void ReceivedInputBuffer(const ac::TimestampUs &timestamp);
 
 private:
     TracepointProvider tp_;
@@ -44,6 +44,6 @@
 
 } // namespace lttng
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/lttng/encoderreport_tp.h' => 'src/ac/report/lttng/encoderreport_tp.h'
--- src/mcs/report/lttng/encoderreport_tp.h	2016-03-07 11:28:32 +0000
+++ src/ac/report/lttng/encoderreport_tp.h	2016-06-07 08:21:39 +0000
@@ -19,16 +19,16 @@
 #define TRACEPOINT_PROVIDER aethercast_encoder
 
 #undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "mcs/report/lttng/encoderreport_tp.h"
-
-#if !defined(MCS_REPORT_LTTNG_ENCODERREPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define MCS_REPORT_LTTNG_ENCODERREPORT_TP_H_
-
-#include "mcs/report/lttng/utils.h"
-
-MCS_LTTNG_VOID_TRACE_CLASS(TRACEPOINT_PROVIDER)
-
-#define ENCODER_TRACE_POINT(name) MCS_LTTNG_VOID_TRACE_POINT(TRACEPOINT_PROVIDER, name)
+#define TRACEPOINT_INCLUDE "ac/report/lttng/encoderreport_tp.h"
+
+#if !defined(AC_REPORT_LTTNG_ENCODERREPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define AC_REPORT_LTTNG_ENCODERREPORT_TP_H_
+
+#include "ac/report/lttng/utils.h"
+
+AC_LTTNG_VOID_TRACE_CLASS(TRACEPOINT_PROVIDER)
+
+#define ENCODER_TRACE_POINT(name) AC_LTTNG_VOID_TRACE_POINT(TRACEPOINT_PROVIDER, name)
 
 ENCODER_TRACE_POINT(started)
 ENCODER_TRACE_POINT(stopped)

=== renamed file 'src/mcs/report/lttng/lttngreportfactory.cpp' => 'src/ac/report/lttng/lttngreportfactory.cpp'
--- src/mcs/report/lttng/lttngreportfactory.cpp	2016-03-07 11:28:32 +0000
+++ src/ac/report/lttng/lttngreportfactory.cpp	2016-06-07 08:21:39 +0000
@@ -15,13 +15,13 @@
  *
  */
 
-#include "mcs/report/lttng/lttngreportfactory.h"
-#include "mcs/report/lttng/encoderreport.h"
-#include "mcs/report/lttng/rendererreport.h"
-#include "mcs/report/lttng/packetizerreport.h"
-#include "mcs/report/lttng/senderreport.h"
+#include "ac/report/lttng/lttngreportfactory.h"
+#include "ac/report/lttng/encoderreport.h"
+#include "ac/report/lttng/rendererreport.h"
+#include "ac/report/lttng/packetizerreport.h"
+#include "ac/report/lttng/senderreport.h"
 
-namespace mcs {
+namespace ac {
 namespace report {
 
 std::shared_ptr<video::EncoderReport> LttngReportFactory::CreateEncoderReport() {
@@ -41,4 +41,4 @@
 }
 
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/lttng/lttngreportfactory.h' => 'src/ac/report/lttng/lttngreportfactory.h'
--- src/mcs/report/lttng/lttngreportfactory.h	2016-03-07 11:28:32 +0000
+++ src/ac/report/lttng/lttngreportfactory.h	2016-06-07 08:21:39 +0000
@@ -15,16 +15,16 @@
  *
  */
 
-#ifndef MCS_REPORT_LTTNGREPORTFACTORY_H_
-#define MCS_REPORT_LTTNGREPORTFACTORY_H_
+#ifndef AC_REPORT_LTTNGREPORTFACTORY_H_
+#define AC_REPORT_LTTNGREPORTFACTORY_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-
-#include "mcs/report/reportfactory.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+
+#include "ac/report/reportfactory.h"
+
+namespace ac {
 namespace report {
 
 class LttngReportFactory : public ReportFactory {
@@ -36,6 +36,6 @@
 };
 
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/lttng/packetizerreport.cpp' => 'src/ac/report/lttng/packetizerreport.cpp'
--- src/mcs/report/lttng/packetizerreport.cpp	2016-03-08 08:48:09 +0000
+++ src/ac/report/lttng/packetizerreport.cpp	2016-06-07 08:21:39 +0000
@@ -15,20 +15,20 @@
  *
  */
 
-#include "mcs/report/lttng/packetizerreport.h"
+#include "ac/report/lttng/packetizerreport.h"
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
-#include "mcs/report/lttng/packetizerreport_tp.h"
+#include "ac/report/lttng/packetizerreport_tp.h"
 
-namespace mcs {
+namespace ac {
 namespace report {
 namespace lttng {
 
 void PacketizerReport::PacketizedFrame(const TimestampUs &timestamp) {
-    mcs_tracepoint(aethercast_packetizer, packetized_frame, timestamp);
+    ac_tracepoint(aethercast_packetizer, packetized_frame, timestamp);
 }
 
 } // namespace lttng
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/lttng/packetizerreport.h' => 'src/ac/report/lttng/packetizerreport.h'
--- src/mcs/report/lttng/packetizerreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/lttng/packetizerreport.h	2016-06-07 08:21:39 +0000
@@ -15,27 +15,27 @@
  *
  */
 
-#ifndef MCS_REPORT_LTTNG_PACKETIZERREPORT_H_
-#define MCS_REPORT_LTTNG_PACKETIZERREPORT_H_
+#ifndef AC_REPORT_LTTNG_PACKETIZERREPORT_H_
+#define AC_REPORT_LTTNG_PACKETIZERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/video/packetizerreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/video/packetizerreport.h"
+
+namespace ac {
 namespace report {
 namespace lttng {
 
 class PacketizerReport : public video::PacketizerReport {
 public:
-     void PacketizedFrame(const mcs::TimestampUs &timestamp);
+     void PacketizedFrame(const ac::TimestampUs &timestamp);
 };
 
 } // namespace lttng
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/lttng/packetizerreport_tp.h' => 'src/ac/report/lttng/packetizerreport_tp.h'
--- src/mcs/report/lttng/packetizerreport_tp.h	2016-03-07 11:28:32 +0000
+++ src/ac/report/lttng/packetizerreport_tp.h	2016-06-07 08:21:39 +0000
@@ -19,16 +19,16 @@
 #define TRACEPOINT_PROVIDER aethercast_packetizer
 
 #undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "mcs/report/lttng/packetizerreport_tp.h"
-
-#if !defined(MCS_REPORT_LTTNG_PACKETIZERREPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define MCS_REPORT_LTTNG_PACKETIZERREPORT_TP_H_
-
-#include "mcs/report/lttng/utils.h"
-
-MCS_LTTNG_VOID_TRACE_CLASS(TRACEPOINT_PROVIDER)
-
-#define ENCODER_TRACE_POINT(name) MCS_LTTNG_VOID_TRACE_POINT(TRACEPOINT_PROVIDER, name)
+#define TRACEPOINT_INCLUDE "ac/report/lttng/packetizerreport_tp.h"
+
+#if !defined(AC_REPORT_LTTNG_PACKETIZERREPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define AC_REPORT_LTTNG_PACKETIZERREPORT_TP_H_
+
+#include "ac/report/lttng/utils.h"
+
+AC_LTTNG_VOID_TRACE_CLASS(TRACEPOINT_PROVIDER)
+
+#define ENCODER_TRACE_POINT(name) AC_LTTNG_VOID_TRACE_POINT(TRACEPOINT_PROVIDER, name)
 
 TRACEPOINT_EVENT(
     TRACEPOINT_PROVIDER,

=== renamed file 'src/mcs/report/lttng/rendererreport.cpp' => 'src/ac/report/lttng/rendererreport.cpp'
--- src/mcs/report/lttng/rendererreport.cpp	2016-03-08 08:48:09 +0000
+++ src/ac/report/lttng/rendererreport.cpp	2016-06-07 08:21:39 +0000
@@ -15,24 +15,24 @@
  *
  */
 
-#include "mcs/report/lttng/rendererreport.h"
+#include "ac/report/lttng/rendererreport.h"
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
-#include "mcs/report/lttng/rendererreport_tp.h"
+#include "ac/report/lttng/rendererreport_tp.h"
 
-namespace mcs {
+namespace ac {
 namespace report {
 namespace lttng {
 
 void RendererReport::BeganFrame() {
-    mcs_tracepoint(aethercast_renderer, began_frame, 0);
+    ac_tracepoint(aethercast_renderer, began_frame, 0);
 }
 
 void RendererReport::FinishedFrame(const TimestampUs &timestamp) {
-    mcs_tracepoint(aethercast_renderer, finished_frame, timestamp);
+    ac_tracepoint(aethercast_renderer, finished_frame, timestamp);
 }
 
 } // namespace lttng
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/lttng/rendererreport.h' => 'src/ac/report/lttng/rendererreport.h'
--- src/mcs/report/lttng/rendererreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/lttng/rendererreport.h	2016-06-07 08:21:39 +0000
@@ -15,28 +15,28 @@
  *
  */
 
-#ifndef MCS_REPORT_LTTNG_RENDERERREPORT_H_
-#define MCS_REPORT_LTTNG_RENDERERREPORT_H_
+#ifndef AC_REPORT_LTTNG_RENDERERREPORT_H_
+#define AC_REPORT_LTTNG_RENDERERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/video/rendererreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/video/rendererreport.h"
+
+namespace ac {
 namespace report {
 namespace lttng {
 
 class RendererReport : public video::RendererReport {
 public:
      void BeganFrame();
-     void FinishedFrame(const mcs::TimestampUs &timestamp);
+     void FinishedFrame(const ac::TimestampUs &timestamp);
 };
 
 } // namespace lttng
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/lttng/rendererreport_tp.h' => 'src/ac/report/lttng/rendererreport_tp.h'
--- src/mcs/report/lttng/rendererreport_tp.h	2016-03-07 11:28:32 +0000
+++ src/ac/report/lttng/rendererreport_tp.h	2016-06-07 08:21:39 +0000
@@ -19,16 +19,16 @@
 #define TRACEPOINT_PROVIDER aethercast_renderer
 
 #undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "mcs/report/lttng/rendererreport_tp.h"
-
-#if !defined(MCS_REPORT_LTTNG_RENDERERREPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define MCS_REPORT_LTTNG_RENDERERREPORT_TP_H_
-
-#include "mcs/report/lttng/utils.h"
-
-MCS_LTTNG_VOID_TRACE_CLASS(TRACEPOINT_PROVIDER)
-
-#define ENCODER_TRACE_POINT(name) MCS_LTTNG_VOID_TRACE_POINT(TRACEPOINT_PROVIDER, name)
+#define TRACEPOINT_INCLUDE "ac/report/lttng/rendererreport_tp.h"
+
+#if !defined(AC_REPORT_LTTNG_RENDERERREPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define AC_REPORT_LTTNG_RENDERERREPORT_TP_H_
+
+#include "ac/report/lttng/utils.h"
+
+AC_LTTNG_VOID_TRACE_CLASS(TRACEPOINT_PROVIDER)
+
+#define ENCODER_TRACE_POINT(name) AC_LTTNG_VOID_TRACE_POINT(TRACEPOINT_PROVIDER, name)
 
 ENCODER_TRACE_POINT(began_frame)
 

=== renamed file 'src/mcs/report/lttng/senderreport.cpp' => 'src/ac/report/lttng/senderreport.cpp'
--- src/mcs/report/lttng/senderreport.cpp	2016-03-08 08:48:09 +0000
+++ src/ac/report/lttng/senderreport.cpp	2016-06-07 08:21:39 +0000
@@ -15,20 +15,20 @@
  *
  */
 
-#include "mcs/report/lttng/senderreport.h"
+#include "ac/report/lttng/senderreport.h"
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
-#include "mcs/report/lttng/senderreport_tp.h"
+#include "ac/report/lttng/senderreport_tp.h"
 
-namespace mcs {
+namespace ac {
 namespace report {
 namespace lttng {
 
 void SenderReport::SentPacket(const TimestampUs &timestamp, const size_t &size) {
-    mcs_tracepoint(aethercast_sender, sent_packet, timestamp, size);
+    ac_tracepoint(aethercast_sender, sent_packet, timestamp, size);
 }
 
 } // namespace lttng
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/lttng/senderreport.h' => 'src/ac/report/lttng/senderreport.h'
--- src/mcs/report/lttng/senderreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/lttng/senderreport.h	2016-06-07 08:21:39 +0000
@@ -15,27 +15,27 @@
  *
  */
 
-#ifndef MCS_REPORT_LTTNG_SENDERREPORT_H_
-#define MCS_REPORT_LTTNG_SENDERREPORT_H_
+#ifndef AC_REPORT_LTTNG_SENDERREPORT_H_
+#define AC_REPORT_LTTNG_SENDERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/video/senderreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/video/senderreport.h"
+
+namespace ac {
 namespace report {
 namespace lttng {
 
 class SenderReport : public video::SenderReport {
 public:
-    void SentPacket(const mcs::TimestampUs &timestamp, const size_t &size);
+    void SentPacket(const ac::TimestampUs &timestamp, const size_t &size);
 };
 
 } // namespace lttng
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/lttng/senderreport_tp.h' => 'src/ac/report/lttng/senderreport_tp.h'
--- src/mcs/report/lttng/senderreport_tp.h	2016-03-07 11:28:32 +0000
+++ src/ac/report/lttng/senderreport_tp.h	2016-06-07 08:21:39 +0000
@@ -19,16 +19,16 @@
 #define TRACEPOINT_PROVIDER aethercast_sender
 
 #undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "mcs/report/lttng/senderreport_tp.h"
-
-#if !defined(MCS_REPORT_LTTNG_SENDERREPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define MCS_REPORT_LTTNG_SENDERREPORT_TP_H_
-
-#include "mcs/report/lttng/utils.h"
-
-MCS_LTTNG_VOID_TRACE_CLASS(TRACEPOINT_PROVIDER)
-
-#define ENCODER_TRACE_POINT(name) MCS_LTTNG_VOID_TRACE_POINT(TRACEPOINT_PROVIDER, name)
+#define TRACEPOINT_INCLUDE "ac/report/lttng/senderreport_tp.h"
+
+#if !defined(AC_REPORT_LTTNG_SENDERREPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define AC_REPORT_LTTNG_SENDERREPORT_TP_H_
+
+#include "ac/report/lttng/utils.h"
+
+AC_LTTNG_VOID_TRACE_CLASS(TRACEPOINT_PROVIDER)
+
+#define ENCODER_TRACE_POINT(name) AC_LTTNG_VOID_TRACE_POINT(TRACEPOINT_PROVIDER, name)
 
 TRACEPOINT_EVENT(
     TRACEPOINT_PROVIDER,

=== renamed file 'src/mcs/report/lttng/tracepointprovider.cpp' => 'src/ac/report/lttng/tracepointprovider.cpp'
--- src/mcs/report/lttng/tracepointprovider.cpp	2016-03-04 11:16:27 +0000
+++ src/ac/report/lttng/tracepointprovider.cpp	2016-06-07 08:21:39 +0000
@@ -19,7 +19,7 @@
 
 #include <boost/throw_exception.hpp>
 
-#include "mcs/report/lttng/tracepointprovider.h"
+#include "ac/report/lttng/tracepointprovider.h"
 
 namespace
 {
@@ -44,7 +44,7 @@
 }
 }
 
-namespace mcs {
+namespace ac {
 namespace report {
 namespace lttng {
 
@@ -58,4 +58,4 @@
 
 } // namespace lttng
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/lttng/tracepointprovider.h' => 'src/ac/report/lttng/tracepointprovider.h'
--- src/mcs/report/lttng/tracepointprovider.h	2016-03-04 11:16:27 +0000
+++ src/ac/report/lttng/tracepointprovider.h	2016-06-07 08:21:39 +0000
@@ -15,18 +15,18 @@
  *
  */
 
-#ifndef MCS_REPORT_LTTNG_TRACEPOINTPROVIDER_H_
-#define MCS_REPORT_LTTNG_TRACEPOINTPROVIDER_H_
+#ifndef AC_REPORT_LTTNG_TRACEPOINTPROVIDER_H_
+#define AC_REPORT_LTTNG_TRACEPOINTPROVIDER_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
+#include "ac/non_copyable.h"
 
-namespace mcs {
+namespace ac {
 namespace report {
 namespace lttng {
 
-class TracepointProvider : public mcs::NonCopyable {
+class TracepointProvider : public ac::NonCopyable {
 public:
     TracepointProvider();
     virtual ~TracepointProvider();
@@ -37,6 +37,6 @@
 
 } // namespace lttng
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/lttng/tracepoints.c' => 'src/ac/report/lttng/tracepoints.c'
=== renamed file 'src/mcs/report/lttng/utils.h' => 'src/ac/report/lttng/utils.h'
--- src/mcs/report/lttng/utils.h	2016-03-04 11:16:27 +0000
+++ src/ac/report/lttng/utils.h	2016-06-07 08:21:39 +0000
@@ -19,14 +19,14 @@
 #include <lttng/tracepoint.h>
 #include <stdint.h>
 
-#ifndef MCS_REPORT_LTTNG_UTILS_H_
-#define MCS_REPORT_LTTNG_UTILS_H_
+#ifndef AC_REPORT_LTTNG_UTILS_H_
+#define AC_REPORT_LTTNG_UTILS_H_
 
-#define MCS_LTTNG_VOID_TRACE_CLASS(comp) \
+#define AC_LTTNG_VOID_TRACE_CLASS(comp) \
     TRACEPOINT_EVENT_CLASS(comp, dummy_event, TP_ARGS(int,empty), TP_FIELDS(ctf_integer(int,empty,empty)))
-#define MCS_LTTNG_VOID_TRACE_POINT(comp, name) \
+#define AC_LTTNG_VOID_TRACE_POINT(comp, name) \
     TRACEPOINT_EVENT_INSTANCE(comp, dummy_event, name, TP_ARGS(int,empty))
 
-#define mcs_tracepoint(c, ...) tracepoint(c, __VA_ARGS__)
+#define ac_tracepoint(c, ...) tracepoint(c, __VA_ARGS__)
 
 #endif

=== added directory 'src/ac/report/null'
=== renamed file 'src/mcs/report/null/encoderreport.cpp' => 'src/ac/report/null/encoderreport.cpp'
--- src/mcs/report/null/encoderreport.cpp	2016-03-08 08:48:09 +0000
+++ src/ac/report/null/encoderreport.cpp	2016-06-07 08:21:39 +0000
@@ -17,9 +17,9 @@
 
 #include <boost/concept_check.hpp>
 
-#include "mcs/report/null/encoderreport.h"
+#include "ac/report/null/encoderreport.h"
 
-namespace mcs {
+namespace ac {
 namespace report {
 namespace null {
 
@@ -29,18 +29,18 @@
 void EncoderReport::Stopped() {
 }
 
-void EncoderReport::BeganFrame(const mcs::TimestampUs &timestamp) {
-    boost::ignore_unused_variable_warning(timestamp);
-}
-
-void EncoderReport::FinishedFrame(const mcs::TimestampUs &timestamp) {
-    boost::ignore_unused_variable_warning(timestamp);
-}
-
-void EncoderReport::ReceivedInputBuffer(const mcs::TimestampUs &timestamp) {
+void EncoderReport::BeganFrame(const ac::TimestampUs &timestamp) {
+    boost::ignore_unused_variable_warning(timestamp);
+}
+
+void EncoderReport::FinishedFrame(const ac::TimestampUs &timestamp) {
+    boost::ignore_unused_variable_warning(timestamp);
+}
+
+void EncoderReport::ReceivedInputBuffer(const ac::TimestampUs &timestamp) {
     boost::ignore_unused_variable_warning(timestamp);
 }
 
 } // namespace null
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/null/encoderreport.h' => 'src/ac/report/null/encoderreport.h'
--- src/mcs/report/null/encoderreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/null/encoderreport.h	2016-06-07 08:21:39 +0000
@@ -15,16 +15,16 @@
  *
  */
 
-#ifndef MCS_REPORT_NULL_ENCODERREPORT_H_
-#define MCS_REPORT_NULL_ENCODERREPORT_H_
+#ifndef AC_REPORT_NULL_ENCODERREPORT_H_
+#define AC_REPORT_NULL_ENCODERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-
-#include "mcs/video/encoderreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+
+#include "ac/video/encoderreport.h"
+
+namespace ac {
 namespace report {
 namespace null {
 
@@ -32,13 +32,13 @@
 public:
     void Started();
     void Stopped();
-    void BeganFrame(const mcs::TimestampUs &timestamp);
-    void FinishedFrame(const mcs::TimestampUs &timestamp);
-    void ReceivedInputBuffer(const mcs::TimestampUs &timestamp);
+    void BeganFrame(const ac::TimestampUs &timestamp);
+    void FinishedFrame(const ac::TimestampUs &timestamp);
+    void ReceivedInputBuffer(const ac::TimestampUs &timestamp);
 };
 
 } // namespace null
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/null/nullreportfactory.cpp' => 'src/ac/report/null/nullreportfactory.cpp'
--- src/mcs/report/null/nullreportfactory.cpp	2016-03-07 11:28:32 +0000
+++ src/ac/report/null/nullreportfactory.cpp	2016-06-07 08:21:39 +0000
@@ -15,13 +15,13 @@
  *
  */
 
-#include "mcs/report/null/nullreportfactory.h"
-#include "mcs/report/null/encoderreport.h"
-#include "mcs/report/null/rendererreport.h"
-#include "mcs/report/null/packetizerreport.h"
-#include "mcs/report/null/senderreport.h"
+#include "ac/report/null/nullreportfactory.h"
+#include "ac/report/null/encoderreport.h"
+#include "ac/report/null/rendererreport.h"
+#include "ac/report/null/packetizerreport.h"
+#include "ac/report/null/senderreport.h"
 
-namespace mcs {
+namespace ac {
 namespace report {
 
 std::shared_ptr<video::EncoderReport> NullReportFactory::CreateEncoderReport() {
@@ -41,4 +41,4 @@
 }
 
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/null/nullreportfactory.h' => 'src/ac/report/null/nullreportfactory.h'
--- src/mcs/report/null/nullreportfactory.h	2016-03-07 11:28:32 +0000
+++ src/ac/report/null/nullreportfactory.h	2016-06-07 08:21:39 +0000
@@ -15,16 +15,16 @@
  *
  */
 
-#ifndef MCS_REPORT_NULLREPORTFACTORY_H_
-#define MCS_REPORT_NULLREPORTFACTORY_H_
+#ifndef AC_REPORT_NULLREPORTFACTORY_H_
+#define AC_REPORT_NULLREPORTFACTORY_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-
-#include "mcs/report/reportfactory.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+
+#include "ac/report/reportfactory.h"
+
+namespace ac {
 namespace report {
 
 class NullReportFactory : public ReportFactory {
@@ -36,6 +36,6 @@
 };
 
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/null/packetizerreport.cpp' => 'src/ac/report/null/packetizerreport.cpp'
--- src/mcs/report/null/packetizerreport.cpp	2016-03-23 13:09:04 +0000
+++ src/ac/report/null/packetizerreport.cpp	2016-06-07 08:21:39 +0000
@@ -17,9 +17,9 @@
 
 #include <boost/concept_check.hpp>
 
-#include "mcs/report/null/packetizerreport.h"
+#include "ac/report/null/packetizerreport.h"
 
-namespace mcs {
+namespace ac {
 namespace report {
 namespace null {
 
@@ -29,4 +29,4 @@
 
 } // namespace null
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/null/packetizerreport.h' => 'src/ac/report/null/packetizerreport.h'
--- src/mcs/report/null/packetizerreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/null/packetizerreport.h	2016-06-07 08:21:39 +0000
@@ -15,27 +15,27 @@
  *
  */
 
-#ifndef MCS_REPORT_NULL_PACKETIZERREPORT_H_
-#define MCS_REPORT_NULL_PACKETIZERREPORT_H_
+#ifndef AC_REPORT_NULL_PACKETIZERREPORT_H_
+#define AC_REPORT_NULL_PACKETIZERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/video/packetizerreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/video/packetizerreport.h"
+
+namespace ac {
 namespace report {
 namespace null {
 
 class PacketizerReport : public video::PacketizerReport {
 public:
-     void PacketizedFrame(const mcs::TimestampUs &timestamp);
+     void PacketizedFrame(const ac::TimestampUs &timestamp);
 };
 
 } // namespace null
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/null/rendererreport.cpp' => 'src/ac/report/null/rendererreport.cpp'
--- src/mcs/report/null/rendererreport.cpp	2016-03-23 13:09:04 +0000
+++ src/ac/report/null/rendererreport.cpp	2016-06-07 08:21:39 +0000
@@ -17,9 +17,9 @@
 
 #include <boost/concept_check.hpp>
 
-#include "mcs/report/null/rendererreport.h"
+#include "ac/report/null/rendererreport.h"
 
-namespace mcs {
+namespace ac {
 namespace report {
 namespace null {
 
@@ -32,4 +32,4 @@
 
 } // namespace null
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/null/rendererreport.h' => 'src/ac/report/null/rendererreport.h'
--- src/mcs/report/null/rendererreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/null/rendererreport.h	2016-06-07 08:21:39 +0000
@@ -15,28 +15,28 @@
  *
  */
 
-#ifndef MCS_REPORT_NULL_RENDERERREPORT_H_
-#define MCS_REPORT_NULL_RENDERERREPORT_H_
+#ifndef AC_REPORT_NULL_RENDERERREPORT_H_
+#define AC_REPORT_NULL_RENDERERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/video/rendererreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/video/rendererreport.h"
+
+namespace ac {
 namespace report {
 namespace null {
 
 class RendererReport : public video::RendererReport {
 public:
      void BeganFrame();
-     void FinishedFrame(const mcs::TimestampUs &timestamp);
+     void FinishedFrame(const ac::TimestampUs &timestamp);
 };
 
 } // namespace null
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/null/senderreport.cpp' => 'src/ac/report/null/senderreport.cpp'
--- src/mcs/report/null/senderreport.cpp	2016-03-23 13:09:04 +0000
+++ src/ac/report/null/senderreport.cpp	2016-06-07 08:21:39 +0000
@@ -17,11 +17,11 @@
 
 #include <boost/concept_check.hpp>
 
-#include "mcs/logger.h"
-
-#include "mcs/report/null/senderreport.h"
-
-namespace mcs {
+#include "ac/logger.h"
+
+#include "ac/report/null/senderreport.h"
+
+namespace ac {
 namespace report {
 namespace null {
 
@@ -32,4 +32,4 @@
 
 } // namespace null
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/null/senderreport.h' => 'src/ac/report/null/senderreport.h'
--- src/mcs/report/null/senderreport.h	2016-03-08 08:48:09 +0000
+++ src/ac/report/null/senderreport.h	2016-06-07 08:21:39 +0000
@@ -15,27 +15,27 @@
  *
  */
 
-#ifndef MCS_REPORT_NULL_SENDERREPORT_H_
-#define MCS_REPORT_NULL_SENDERREPORT_H_
+#ifndef AC_REPORT_NULL_SENDERREPORT_H_
+#define AC_REPORT_NULL_SENDERREPORT_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-#include "mcs/utils.h"
-
-#include "mcs/video/senderreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+#include "ac/utils.h"
+
+#include "ac/video/senderreport.h"
+
+namespace ac {
 namespace report {
 namespace null {
 
 class SenderReport : public video::SenderReport {
 public:
-    void SentPacket(const mcs::TimestampUs &timestamp, const size_t &size);
+    void SentPacket(const ac::TimestampUs &timestamp, const size_t &size);
 };
 
 } // namespace null
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/report/reportfactory.cpp' => 'src/ac/report/reportfactory.cpp'
--- src/mcs/report/reportfactory.cpp	2016-03-17 15:31:21 +0000
+++ src/ac/report/reportfactory.cpp	2016-06-07 08:21:39 +0000
@@ -15,18 +15,18 @@
  *
  */
 
-#include "mcs/utils.h"
-
-#include "mcs/report/reportfactory.h"
-#include "mcs/report/null/nullreportfactory.h"
-#include "mcs/report/logging/loggingreportfactory.h"
-#include "mcs/report/lttng/lttngreportfactory.h"
-
-namespace mcs {
+#include "ac/utils.h"
+
+#include "ac/report/reportfactory.h"
+#include "ac/report/null/nullreportfactory.h"
+#include "ac/report/logging/loggingreportfactory.h"
+#include "ac/report/lttng/lttngreportfactory.h"
+
+namespace ac {
 namespace report {
 
 ReportFactory::Ptr ReportFactory::Create() {
-    std::string type = mcs::Utils::GetEnvValue("AETHERCAST_REPORT_TYPE");
+    std::string type = ac::Utils::GetEnvValue("AETHERCAST_REPORT_TYPE");
 
     if (type == "log")
         return std::make_shared<LoggingReportFactory>();
@@ -37,4 +37,4 @@
 }
 
 } // namespace report
-} // namespace mcs
+} // namespace ac

=== renamed file 'src/mcs/report/reportfactory.h' => 'src/ac/report/reportfactory.h'
--- src/mcs/report/reportfactory.h	2016-03-17 15:31:21 +0000
+++ src/ac/report/reportfactory.h	2016-06-07 08:21:39 +0000
@@ -15,22 +15,22 @@
  *
  */
 
-#ifndef MCS_REPORT_REPORTFACTORY_H_
-#define MCS_REPORT_REPORTFACTORY_H_
+#ifndef AC_REPORT_REPORTFACTORY_H_
+#define AC_REPORT_REPORTFACTORY_H_
 
 #include <memory>
 
-#include "mcs/non_copyable.h"
-
-#include "mcs/video/encoderreport.h"
-#include "mcs/video/rendererreport.h"
-#include "mcs/video/packetizerreport.h"
-#include "mcs/video/senderreport.h"
-
-namespace mcs {
+#include "ac/non_copyable.h"
+
+#include "ac/video/encoderreport.h"
+#include "ac/video/rendererreport.h"
+#include "ac/video/packetizerreport.h"
+#include "ac/video/senderreport.h"
+
+namespace ac {
 namespace report {
 
-class ReportFactory : public mcs::NonCopyable {
+class ReportFactory : public ac::NonCopyable {
 public:
     typedef std::shared_ptr<ReportFactory> Ptr;
 
@@ -43,6 +43,6 @@
 };
 
 } // namespace report
-} // namespace mcs
+} // namespace ac
 
 #endif

=== renamed file 'src/mcs/scoped_gobject.h' => 'src/ac/scoped_gobject.h'
--- src/mcs/scoped_gobject.h	2016-03-23 09:03:50 +0000
+++ src/ac/scoped_gobject.h	2016-06-07 08:21:39 +0000
@@ -20,10 +20,10 @@
 
 #include <memory>
 
-#include "mcs/glib_wrapper.h"
-#include "mcs/gobject_deleter.h"
+#include "ac/glib_wrapper.h"
+#include "ac/gobject_deleter.h"
 
-namespace mcs {
+namespace ac {
 // A ScopedGObject instance handles raw GObject instances
 // and automatically cleans them up on destruction.
 template<typename T>

=== renamed file 'src/mcs/miracastservice.cpp' => 'src/ac/service.cpp'
--- src/mcs/miracastservice.cpp	2016-04-27 12:30:28 +0000
+++ src/ac/service.cpp	2016-06-07 08:21:39 +0000
@@ -30,14 +30,15 @@
 
 #include <wds/logging.h>
 
-#include "mcs/config.h"
-#include "keep_alive.h"
-#include "logger.h"
-#include "miracastservice.h"
-#include "miracastcontrollerskeleton.h"
-#include "networkmanagerfactory.h"
-#include "types.h"
-#include "logging.h"
+#include "ac/config.h"
+#include "ac/keep_alive.h"
+#include "ac/logger.h"
+#include "ac/service.h"
+#include "ac/networkmanagerfactory.h"
+#include "ac/types.h"
+#include "ac/logger.h"
+
+#include "ac/dbus/controllerskeleton.h"
 
 namespace {
 // TODO(morphis, tvoss): Expose the port as a construction-time parameter.
@@ -47,7 +48,7 @@
 const std::int16_t kProcessPriorityUrgentDisplay{-8};
 
 // SafeLog serves as integration point to the wds::LogSystem world.
-template <mcs::Logger::Severity severity>
+template <ac::Logger::Severity severity>
 void SafeLog (const char *format, ...)
 {
     static constexpr const std::size_t kBufferSize{256};
@@ -56,12 +57,12 @@
     va_list args;
     va_start(args, format);
     std::vsnprintf(buffer, kBufferSize, format, args);
-    mcs::Log().Log(severity, std::string{buffer}, boost::optional<mcs::Logger::Location>{});
+    ac::Log().Log(severity, std::string{buffer}, boost::optional<ac::Logger::Location>{});
     va_end (args);
 }
 }
-namespace mcs {
-MiracastService::MainOptions MiracastService::MainOptions::FromCommandLine(int argc, char** argv) {
+namespace ac {
+Service::MainOptions Service::MainOptions::FromCommandLine(int argc, char** argv) {
     static gboolean option_debug{FALSE};
     static gboolean option_version{FALSE};
 
@@ -88,14 +89,14 @@
     return MainOptions{option_debug == TRUE, option_version == TRUE};
 }
 
-int MiracastService::Main(const MiracastService::MainOptions &options) {
+int Service::Main(const Service::MainOptions &options) {
     if (options.print_version) {
-        std::printf("%d.%d\n", MiracastService::kVersionMajor, MiracastService::kVersionMinor);
+        std::printf("%d.%d\n", Service::kVersionMajor, Service::kVersionMinor);
         return 0;
     }
 
     if (options.debug)
-        mcs::Log().Init(mcs::Logger::Severity::kDebug);
+        ac::Log().Init(ac::Logger::Severity::kDebug);
 
     struct Runtime {
         static gboolean OnSignalRaised(gpointer user_data) {
@@ -105,7 +106,7 @@
             // things a small amount of time to perform their shutdown jobs.
             thiz->service->Shutdown();
 
-            MCS_DEBUG("Exiting");
+            AC_DEBUG("Exiting");
 
             g_timeout_add_seconds(kShutdownGracePreriod.count(), [](gpointer user_data) {
                 auto thiz = static_cast<Runtime*>(user_data);
@@ -126,10 +127,10 @@
             g_unix_signal_add(SIGTERM, OnSignalRaised, this);
 
             // Redirect all wds logging to our own.
-            wds::LogSystem::set_vlog_func(SafeLog<mcs::Logger::Severity::kTrace>);
-            wds::LogSystem::set_log_func(SafeLog<mcs::Logger::Severity::kInfo>);
-            wds::LogSystem::set_warning_func(SafeLog<mcs::Logger::Severity::kWarning>);
-            wds::LogSystem::set_error_func(SafeLog<mcs::Logger::Severity::kError>);
+            wds::LogSystem::set_vlog_func(SafeLog<ac::Logger::Severity::kTrace>);
+            wds::LogSystem::set_log_func(SafeLog<ac::Logger::Severity::kInfo>);
+            wds::LogSystem::set_warning_func(SafeLog<ac::Logger::Severity::kWarning>);
+            wds::LogSystem::set_error_func(SafeLog<ac::Logger::Severity::kError>);
 
             // Redirect all g* logging to our own.
             g_log_set_default_handler([](const gchar *domain, GLogLevelFlags log_level, const gchar *msg, gpointer) {
@@ -162,8 +163,8 @@
             // Raise our process priority to be as fast as possible
             setpriority(PRIO_PROCESS, 0, kProcessPriorityUrgentDisplay);
 
-            service = mcs::MiracastService::Create();
-            mcsa = mcs::MiracastControllerSkeleton::create(service);
+            service = ac::Service::Create();
+            controller_skeleton = ac::dbus::ControllerSkeleton::Create(service);
         }
 
         ~Runtime() {
@@ -175,8 +176,8 @@
         }
 
         GMainLoop *ml = g_main_loop_new(nullptr, FALSE);
-        mcs::MiracastService::Ptr service;
-        mcs::MiracastControllerSkeleton::Ptr mcsa;
+        ac::Service::Ptr service;
+        ac::dbus::ControllerSkeleton::Ptr controller_skeleton;
     } rt;
 
     rt.Run();
@@ -184,12 +185,12 @@
     return 0;
 }
 
-std::shared_ptr<MiracastService> MiracastService::Create() {
-    auto sp = std::shared_ptr<MiracastService>{new MiracastService{}};
+std::shared_ptr<Service> Service::Create() {
+    auto sp = std::shared_ptr<Service>{new Service{}};
     return sp->FinalizeConstruction();
 }
 
-MiracastService::MiracastService() :
+Service::Service() :
     current_state_(kIdle),
     scan_timeout_source_(0),
     supported_roles_({kSource}),
@@ -198,10 +199,10 @@
     CreateRuntimeDirectory();
 }
 
-std::shared_ptr<MiracastService> MiracastService::FinalizeConstruction() {
-    system_controller_ = mcs::SystemController::CreatePlatformDefault();
+std::shared_ptr<Service> Service::FinalizeConstruction() {
+    system_controller_ = ac::SystemController::CreatePlatformDefault();
 
-    network_manager_ = mcs::NetworkManagerFactory::Create();
+    network_manager_ = ac::NetworkManagerFactory::Create();
     network_manager_->SetDelegate(this);
     network_manager_->SetCapabilities({NetworkManager::Capability::kSource});
 
@@ -210,13 +211,13 @@
     return shared_from_this();
 }
 
-MiracastService::~MiracastService() {
+Service::~Service() {
     if (scan_timeout_source_ > 0)
         g_source_remove(scan_timeout_source_);
 }
 
-void MiracastService::CreateRuntimeDirectory() {
-    boost::filesystem::path runtime_dir(mcs::kRuntimePath);
+void Service::CreateRuntimeDirectory() {
+    boost::filesystem::path runtime_dir(ac::kRuntimePath);
 
     if (boost::filesystem::is_directory(runtime_dir))
         boost::filesystem::remove_all(runtime_dir);
@@ -224,8 +225,8 @@
     boost::filesystem::create_directory(runtime_dir);
 }
 
-void MiracastService::LoadState() {
-    boost::filesystem::path state_dir(mcs::kStateDir);
+void Service::LoadState() {
+    boost::filesystem::path state_dir(ac::kStateDir);
 
     if (!boost::filesystem::is_directory(state_dir))
         return;
@@ -234,54 +235,54 @@
     SetEnabled(boost::filesystem::exists(enabled_path));
 }
 
-void MiracastService::SaveState() {
-    boost::filesystem::path state_dir(mcs::kStateDir);
+void Service::SaveState() {
+    boost::filesystem::path state_dir(ac::kStateDir);
 
     if (!boost::filesystem::is_directory(state_dir))
         boost::filesystem::create_directory(state_dir);