16 files changed, 8 insertions, 8 deletions
diff --git a/mullvad-daemon/src/tunnel_state_machine/connected_state.rs b/mullvad-daemon/src/tunnel_state_machine/connected_state.rs
index a93dd5f6ce..88b12e3ec8 100644
--- a/mullvad-daemon/src/tunnel_state_machine/connected_state.rs
+++ b/mullvad-daemon/src/tunnel_state_machine/connected_state.rs
@@ -1,7 +1,7 @@
 use futures::sync::{mpsc, oneshot};
 use futures::{Async, Future, Stream};
 
-use talpid_core::firewall::{NetworkSecurity, SecurityPolicy};
+use talpid_core::security::{NetworkSecurity, SecurityPolicy};
 use talpid_core::tunnel::{CloseHandle, TunnelEvent, TunnelMetadata};
 use talpid_types::net::TunnelEndpoint;
 
diff --git a/mullvad-daemon/src/tunnel_state_machine/connecting_state.rs b/mullvad-daemon/src/tunnel_state_machine/connecting_state.rs
index 150c8915a5..c05d85d217 100644
--- a/mullvad-daemon/src/tunnel_state_machine/connecting_state.rs
+++ b/mullvad-daemon/src/tunnel_state_machine/connecting_state.rs
@@ -8,7 +8,7 @@ use futures::sink::Wait;
 use futures::sync::{mpsc, oneshot};
 use futures::{Async, Future, Sink, Stream};
 
-use talpid_core::firewall::{NetworkSecurity, SecurityPolicy};
+use talpid_core::security::{NetworkSecurity, SecurityPolicy};
 use talpid_core::tunnel::{CloseHandle, TunnelEvent, TunnelMetadata, TunnelMonitor};
 use talpid_types::net::{TunnelEndpoint, TunnelEndpointData};
 
diff --git a/mullvad-daemon/src/tunnel_state_machine/disconnected_state.rs b/mullvad-daemon/src/tunnel_state_machine/disconnected_state.rs
index a768100261..a64f2ca543 100644
--- a/mullvad-daemon/src/tunnel_state_machine/disconnected_state.rs
+++ b/mullvad-daemon/src/tunnel_state_machine/disconnected_state.rs
@@ -2,7 +2,7 @@ use error_chain::ChainedError;
 use futures::sync::mpsc;
 use futures::Stream;
 
-use talpid_core::firewall::NetworkSecurity;
+use talpid_core::security::NetworkSecurity;
 
 use super::{
     ConnectingState, Error, EventConsequence, SharedTunnelStateValues, StateEntryResult,
diff --git a/mullvad-daemon/src/tunnel_state_machine/mod.rs b/mullvad-daemon/src/tunnel_state_machine/mod.rs
index f30c990f98..29e1e5869a 100644
--- a/mullvad-daemon/src/tunnel_state_machine/mod.rs
+++ b/mullvad-daemon/src/tunnel_state_machine/mod.rs
@@ -17,8 +17,8 @@ use futures::{Async, Future, Poll, Stream};
 use tokio_core::reactor::Core;
 
 use mullvad_types::account::AccountToken;
-use talpid_core::firewall::{NetworkSecurity, NetworkSecurityImpl};
 use talpid_core::mpsc::IntoSender;
+use talpid_core::security::{NetworkSecurity, NetworkSecurityImpl};
 use talpid_types::net::{TunnelEndpoint, TunnelOptions};
 
 use self::connected_state::{ConnectedState, ConnectedStateBootstrap};
diff --git a/mullvad-problem-report/src/main.rs b/mullvad-problem-report/src/main.rs
index d43cfc8a4b..de98bec2c1 100644
--- a/mullvad-problem-report/src/main.rs
+++ b/mullvad-problem-report/src/main.rs
@@ -628,8 +628,8 @@ mod tests {
     #[test]
     fn doesnt_redact_not_ipv6() {
         let report = ProblemReport::new(vec![]);
-        let actual = report.redact("[talpid_core::firewall]");
-        assert_eq!("[talpid_core::firewall]", actual);
+        let actual = report.redact("[talpid_core::security]");
+        assert_eq!("[talpid_core::security]", actual);
     }
 
     fn assert_redacts_ipv6(input: &str) {
diff --git a/talpid-core/src/lib.rs b/talpid-core/src/lib.rs
index de3bd84ea6..1ee4d3b6ad 100644
--- a/talpid-core/src/lib.rs
+++ b/talpid-core/src/lib.rs
@@ -50,7 +50,7 @@ pub mod tunnel;
 /// Abstractions and extra features on `std::mpsc`
 pub mod mpsc;
 
-/// Abstractions over different firewalls
-pub mod firewall;
+/// Abstractions over operating system network security settings.
+pub mod security;
 
 mod mktemp;
diff --git a/talpid-core/src/firewall/linux/dns.rs b/talpid-core/src/security/linux/dns.rs
index a85e45cbfb..a85e45cbfb 100644
--- a/talpid-core/src/firewall/linux/dns.rs
+++ b/talpid-core/src/security/linux/dns.rs
diff --git a/talpid-core/src/firewall/linux/mod.rs b/talpid-core/src/security/linux/mod.rs
index e904f03966..e904f03966 100644
--- a/talpid-core/src/firewall/linux/mod.rs
+++ b/talpid-core/src/security/linux/mod.rs
diff --git a/talpid-core/src/firewall/macos/dns.rs b/talpid-core/src/security/macos/dns.rs
index 5cadf3f58d..5cadf3f58d 100644
--- a/talpid-core/src/firewall/macos/dns.rs
+++ b/talpid-core/src/security/macos/dns.rs
diff --git a/talpid-core/src/firewall/macos/mod.rs b/talpid-core/src/security/macos/mod.rs
index b7477f81e8..b7477f81e8 100644
--- a/talpid-core/src/firewall/macos/mod.rs
+++ b/talpid-core/src/security/macos/mod.rs
diff --git a/talpid-core/src/firewall/mod.rs b/talpid-core/src/security/mod.rs
index a37bb23253..a37bb23253 100644
--- a/talpid-core/src/firewall/mod.rs
+++ b/talpid-core/src/security/mod.rs
diff --git a/talpid-core/src/firewall/windows/dns.rs b/talpid-core/src/security/windows/dns.rs
index 73593e7ccb..73593e7ccb 100644
--- a/talpid-core/src/firewall/windows/dns.rs
+++ b/talpid-core/src/security/windows/dns.rs
diff --git a/talpid-core/src/firewall/windows/ffi.rs b/talpid-core/src/security/windows/ffi.rs
index 029989359e..029989359e 100644
--- a/talpid-core/src/firewall/windows/ffi.rs
+++ b/talpid-core/src/security/windows/ffi.rs
diff --git a/talpid-core/src/firewall/windows/mod.rs b/talpid-core/src/security/windows/mod.rs
index 6789674971..6789674971 100644
--- a/talpid-core/src/firewall/windows/mod.rs
+++ b/talpid-core/src/security/windows/mod.rs
diff --git a/talpid-core/src/firewall/windows/route.rs b/talpid-core/src/security/windows/route.rs
index 6ecf336956..6ecf336956 100644
--- a/talpid-core/src/firewall/windows/route.rs
+++ b/talpid-core/src/security/windows/route.rs
diff --git a/talpid-core/src/firewall/windows/system_state.rs b/talpid-core/src/security/windows/system_state.rs
index cdc36f4e36..cdc36f4e36 100644
--- a/talpid-core/src/firewall/windows/system_state.rs
+++ b/talpid-core/src/security/windows/system_state.rs