diff --git a/Makefile.in b/Makefile.in
index 152d25949..d20091781 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,9 +115,9 @@ OBJS	      = @OBJS@ \
 		ldgm-coding/matrix-gen/ldpc-matrix.o \
 		@LIB_SUPPORT_OBJ@ \
 
-HD_RUM_TRANSCODE_OBJS = src/hd-rum-decompress.o \
-		src/hd-rum-recompress.o \
-		src/hd-rum-translator.o
+HD_RUM_TRANSLATOR_OBJS = src/hd-rum-translator/hd-rum-decompress.o \
+		src/hd-rum-translator/hd-rum-recompress.o \
+		src/hd-rum-translator/hd-rum-translator.o
 
 LIB_COMMON = \
 		src/audio/utils.o \
diff --git a/src/hd-rum-decompress.cpp b/src/hd-rum-translator/hd-rum-decompress.cpp
similarity index 99%
rename from src/hd-rum-decompress.cpp
rename to src/hd-rum-translator/hd-rum-decompress.cpp
index 6f782b555..0f5db067e 100644
--- a/src/hd-rum-decompress.cpp
+++ b/src/hd-rum-translator/hd-rum-decompress.cpp
@@ -4,8 +4,8 @@
 #include "config_win32.h"
 #endif
 
-#include "hd-rum-decompress.h"
-#include "hd-rum-recompress.h"
+#include "hd-rum-translator/hd-rum-decompress.h"
+#include "hd-rum-translator/hd-rum-recompress.h"
 #include "rtp/ldgm.h"
 
 #include <map>
diff --git a/src/hd-rum-decompress.h b/src/hd-rum-translator/hd-rum-decompress.h
similarity index 100%
rename from src/hd-rum-decompress.h
rename to src/hd-rum-translator/hd-rum-decompress.h
diff --git a/src/hd-rum-recompress.cpp b/src/hd-rum-translator/hd-rum-recompress.cpp
similarity index 99%
rename from src/hd-rum-recompress.cpp
rename to src/hd-rum-translator/hd-rum-recompress.cpp
index 89836e48f..4b611c60a 100644
--- a/src/hd-rum-recompress.cpp
+++ b/src/hd-rum-translator/hd-rum-recompress.cpp
@@ -4,7 +4,7 @@
 #include "config_win32.h"
 #endif
 
-#include "hd-rum-recompress.h"
+#include "hd-rum-translator/hd-rum-recompress.h"
 
 extern "C" {
 #include "debug.h"
diff --git a/src/hd-rum-recompress.h b/src/hd-rum-translator/hd-rum-recompress.h
similarity index 100%
rename from src/hd-rum-recompress.h
rename to src/hd-rum-translator/hd-rum-recompress.h
diff --git a/src/hd-rum-translator.c b/src/hd-rum-translator/hd-rum-translator.c
similarity index 99%
rename from src/hd-rum-translator.c
rename to src/hd-rum-translator/hd-rum-translator.c
index 5efa5d68a..4f214fc72 100644
--- a/src/hd-rum-translator.c
+++ b/src/hd-rum-translator/hd-rum-translator.c
@@ -22,8 +22,8 @@
 #include <pthread.h>
 #include <fcntl.h>
 
-#include "hd-rum-recompress.h"
-#include "hd-rum-decompress.h"
+#include "hd-rum-translator/hd-rum-recompress.h"
+#include "hd-rum-translator/hd-rum-decompress.h"
 
 #define EXIT_FAIL_USAGE 1
 #define EXIT_INIT_PORT 3
diff --git a/src/video_capture/swmix.cpp b/src/video_capture/swmix.cpp
index dd8d3e321..05903785d 100644
--- a/src/video_capture/swmix.cpp
+++ b/src/video_capture/swmix.cpp
@@ -572,7 +572,7 @@ vidcap_swmix_init(char *init_fmt, unsigned int flags)
 
         int token_nr = 0;
         tmp = parse_string = strdup(init_fmt);
-        if(strchr(parse_str, '#')) *strchr(parse_str, '#') = '\0';
+        if(strchr(parse_string, '#')) *strchr(parse_string, '#') = '\0';
         while((item = strtok_r(tmp, ":", &save_ptr))) {
                 bool found = false;
                 switch (token_nr) {