diff --git a/ChangeLog b/ChangeLog
index 47ca60eed..39d886129 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-09  Dan Williams <dcbw@redhat.com>
+
+	* NetworkManager.h
+	  src/vpn-manager/nm-vpn-service.c
+		- NM_VPN_STATE_ERROR -> NM_VPN_STATE_UNKNOWN (more consistent with other enums)
+
 2005-05-27  Dan Williams <dcbw@redhat.com>
 
 	* vpn-daemons/vpnc/nm-vpnc-service.c
diff --git a/NetworkManager.h b/NetworkManager.h
index d5b167c6a..75640b4b6 100644
--- a/NetworkManager.h
+++ b/NetworkManager.h
@@ -181,7 +181,7 @@ typedef enum NMDeviceAuthMethod
  */
 typedef enum NMVPNState
 {
-	NM_VPN_STATE_ERROR = 0,
+	NM_VPN_STATE_UNKNOWN = 0,
 	NM_VPN_STATE_INIT,
 	NM_VPN_STATE_SHUTDOWN,
 	NM_VPN_STATE_STARTING,
diff --git a/src/vpn-manager/nm-vpn-service.c b/src/vpn-manager/nm-vpn-service.c
index 8b97e6f9e..b746ada4d 100644
--- a/src/vpn-manager/nm-vpn-service.c
+++ b/src/vpn-manager/nm-vpn-service.c
@@ -126,7 +126,7 @@ void nm_vpn_service_set_program (NMVPNService *service, const char *program)
 
 NMVPNState nm_vpn_service_get_state (NMVPNService *service)
 {
-	g_return_val_if_fail (service != NULL, NM_VPN_STATE_ERROR);
+	g_return_val_if_fail (service != NULL, NM_VPN_STATE_UNKNOWN);
 
 	return service->state;
 }