diff --git a/clients/cli/Makefile.am b/clients/cli/Makefile.am
index 7fa67948ec..94a249749e 100644
--- a/clients/cli/Makefile.am
+++ b/clients/cli/Makefile.am
@@ -21,8 +21,8 @@ nmcli_SOURCES = \
 	connections.h \
 	devices.c \
 	devices.h \
-	network-manager.c \
-	network-manager.h \
+	general.c \
+	general.h \
 	settings.c \
 	settings.h \
 	nmcli.c \
diff --git a/clients/cli/network-manager.c b/clients/cli/general.c
similarity index 99%
rename from clients/cli/network-manager.c
rename to clients/cli/general.c
index a071d6694c..b3b24cae0a 100644
--- a/clients/cli/network-manager.c
+++ b/clients/cli/general.c
@@ -14,7 +14,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2010 - 2014 Red Hat, Inc.
+ * Copyright 2010 - 2014 Red Hat, Inc.
  */
 
 #include "config.h"
@@ -26,7 +26,7 @@
 #include <glib/gi18n.h>
 
 #include "utils.h"
-#include "network-manager.h"
+#include "general.h"
 
 
 /* Available fields for 'general status' */
diff --git a/clients/cli/network-manager.h b/clients/cli/general.h
similarity index 87%
rename from clients/cli/network-manager.h
rename to clients/cli/general.h
index bccba7cee3..7e8c21f9bc 100644
--- a/clients/cli/network-manager.h
+++ b/clients/cli/general.h
@@ -14,11 +14,11 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2010 - 2012 Red Hat, Inc.
+ * Copyright 2010 - 2014 Red Hat, Inc.
  */
 
-#ifndef NMC_NETWORK_MANAGER_H
-#define NMC_NETWORK_MANAGER_H
+#ifndef NMC_GENERAL_H
+#define NMC_GENERAL_H
 
 #include "nmcli.h"
 
@@ -26,4 +26,4 @@ NMCResultCode do_general    (NmCli *nmc, int argc, char **argv);
 NMCResultCode do_networking (NmCli *nmc, int argc, char **argv);
 NMCResultCode do_radio      (NmCli *nmc, int argc, char **argv);
 
-#endif /* NMC_NETWORK_MANAGER_H */
+#endif /* NMC_GENERAL_H */
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 83fa4f0603..e89b150f6a 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2010 - 2014 Red Hat, Inc.
+ * Copyright 2010 - 2014 Red Hat, Inc.
  */
 
 /* Generated configuration file */
@@ -39,7 +39,7 @@
 #include "common.h"
 #include "connections.h"
 #include "devices.h"
-#include "network-manager.h"
+#include "general.h"
 
 #if defined(NM_DIST_VERSION)
 # define NMCLI_VERSION NM_DIST_VERSION