diff --git a/lib/manageiq/network/discovery.rb b/lib/manageiq/network_discovery/discovery.rb
similarity index 94%
rename from lib/manageiq/network/discovery.rb
rename to lib/manageiq/network_discovery/discovery.rb
index 434f4cc7f911..2a4adf0d4717 100644
--- a/lib/manageiq/network/discovery.rb
+++ b/lib/manageiq/network_discovery/discovery.rb
@@ -1,9 +1,9 @@
 require 'net/ping'
 
 module ManageIQ
-  module Network
+  module NetworkDiscovery
     module IPMI
-      autoload :Discovery, 'manageiq/network/ipmi/discovery'
+      autoload :Discovery, 'manageiq/network_discovery/ipmi/discovery'
     end
 
     module Discovery
diff --git a/lib/manageiq/network/ipmi/discovery.rb b/lib/manageiq/network_discovery/ipmi/discovery.rb
similarity index 100%
rename from lib/manageiq/network/ipmi/discovery.rb
rename to lib/manageiq/network_discovery/ipmi/discovery.rb
diff --git a/lib/manageiq/network/port.rb b/lib/manageiq/network_discovery/port.rb
similarity index 97%
rename from lib/manageiq/network/port.rb
rename to lib/manageiq/network_discovery/port.rb
index 379f1b4de389..81e442dbd97e 100644
--- a/lib/manageiq/network/port.rb
+++ b/lib/manageiq/network_discovery/port.rb
@@ -2,7 +2,7 @@
 require 'socket'
 
 module ManageIQ
-  module Network
+  module NetworkDiscovery
     class Port
       def self.all_open?(ost, ports)
         ports.all? { |port| open?(ost, port) }