from gnome import gconf
-from wifi_assistant.settings.NetworkSettings import NetworkSettings
-from wifi_assistant.settings.NetworkSetting import NetworkSetting
+from wifi_assistant.settings.network_settings import NetworkSettings
+from wifi_assistant.settings.network_setting import NetworkSetting
import unittest