diff --git a/daemon/commands/conference.h b/daemon/commands/conference.h
index 5cc66c530..c430f43e5 100644
--- a/daemon/commands/conference.h
+++ b/daemon/commands/conference.h
@@ -1,5 +1,5 @@
-#ifndef CONFERENCE_H
-#define CONFERENCE_H
+#ifndef COMMANDS_CONFERENCE_H
+#define COMMANDS_CONFERENCE_H
 
 #include "daemon.h"
 
diff --git a/daemon/daemon.cc b/daemon/daemon.cc
index 264b5b70f..47f820ab0 100644
--- a/daemon/daemon.cc
+++ b/daemon/daemon.cc
@@ -449,7 +449,7 @@ void Daemon::initCommands() {
 	mCommands.push_back(new Video());
 	mCommands.push_back(new VideoSource());
 	mCommands.push_back(new AutoVideo());
-	mCommands.push_back(new Conference::Conference());
+	mCommands.push_back(new Conference());
 	mCommands.push_back(new AudioCodecGetCommand());
 	mCommands.push_back(new AudioCodecEnableCommand());
 	mCommands.push_back(new AudioCodecDisableCommand());