Drop useless model suffix.

7 files changed, 13 insertions, 13 deletions

diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 12a1ef0..5b25e05 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -30,7 +30,7 @@ from sugar.graphics import iconentry
 from sugar.graphics.menuitem import MenuItem
 from sugar import profile
 
-from jarabe.model import accesspointmodel
+from jarabe.model import accesspoint
 from jarabe.model import neighborhood
 from jarabe.model import network
 from jarabe.view.buddyicon import BuddyIcon
@@ -139,7 +139,7 @@ class AccessPointView(CanvasPulsingIcon):
     def _update_icon(self):
         # keep this code in sync with view/devices/network/wireless.py
         strength = self._model.props.strength
-        if self._model.props.state == accesspointmodel.STATE_CONNECTED:
+        if self._model.props.state == accesspoint.STATE_CONNECTED:
             icon_name = '%s-connected' % _ICON_NAME
         else:
             icon_name = _ICON_NAME
@@ -150,20 +150,20 @@ class AccessPointView(CanvasPulsingIcon):
             icon.props.icon_name = icon_name
 
     def _update_state(self):
-        if self._model.props.state == accesspointmodel.STATE_CONNECTING:
+        if self._model.props.state == accesspoint.STATE_CONNECTING:
             if self._disconnect_item:
                 self._disconnect_item.show()
             self._connect_item.hide()
             self._palette.props.secondary_text = _('Connecting...')
             self.props.pulsing = True
-        elif self._model.props.state == accesspointmodel.STATE_CONNECTED:
+        elif self._model.props.state == accesspoint.STATE_CONNECTED:
             if self._disconnect_item:
                 self._disconnect_item.show()
             self._connect_item.hide()
             # TODO: show the channel number
             self._palette.props.secondary_text = _('Connected')
             self.props.pulsing = False
-        elif self._model.props.state == accesspointmodel.STATE_NOTCONNECTED:
+        elif self._model.props.state == accesspoint.STATE_NOTCONNECTED:
             if self._disconnect_item:
                 self._disconnect_item.hide()
             self._connect_item.show()
diff --git a/src/jarabe/frame/friendstray.py b/src/jarabe/frame/friendstray.py
index 52d0b9f..b796a1e 100644
--- a/src/jarabe/frame/friendstray.py
+++ b/src/jarabe/frame/friendstray.py
@@ -22,7 +22,7 @@ from jarabe.view.buddymenu import BuddyMenu
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.model import shellmodel
 from jarabe.model import owner
-from jarabe.model.buddymodel import BuddyModel
+from jarabe.model.buddy import BuddyModel
 
 class FriendIcon(TrayIcon):
     def __init__(self, buddy):
diff --git a/src/jarabe/model/Makefile.am b/src/jarabe/model/Makefile.am
index d6833a5..e920003 100644
--- a/src/jarabe/model/Makefile.am
+++ b/src/jarabe/model/Makefile.am
@@ -1,8 +1,8 @@
 sugardir = $(pythondir)/jarabe/model
 sugar_PYTHON =			\
 	__init__.py		\
-	accesspointmodel.py	\
-	buddymodel.py		\
+	accesspoint.py		\
+	buddy.py		\
 	friends.py		\
 	homeactivity.py		\
 	homemodel.py		\
diff --git a/src/jarabe/model/accesspointmodel.py b/src/jarabe/model/accesspoint.py
index 4c016b8..4c016b8 100644
--- a/src/jarabe/model/accesspointmodel.py
+++ b/src/jarabe/model/accesspoint.py
diff --git a/src/jarabe/model/buddymodel.py b/src/jarabe/model/buddy.py
index b51b808..b51b808 100644
--- a/src/jarabe/model/buddymodel.py
+++ b/src/jarabe/model/buddy.py
diff --git a/src/jarabe/model/friends.py b/src/jarabe/model/friends.py
index 473b14d..59411d4 100644
--- a/src/jarabe/model/friends.py
+++ b/src/jarabe/model/friends.py
@@ -14,15 +14,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import dbus
 import os
+import logging
 from ConfigParser import ConfigParser
 
 import gobject
+import dbus
 
-from jarabe.model.buddymodel import BuddyModel
+from jarabe.model.buddy import BuddyModel
 from sugar import env
-import logging
 
 class Friends(gobject.GObject):
     __gsignals__ = {
diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py
index 42239bd..5481367 100644
--- a/src/jarabe/model/neighborhood.py
+++ b/src/jarabe/model/neighborhood.py
@@ -20,8 +20,8 @@ from sugar.graphics.xocolor import XoColor
 from sugar.presence import presenceservice
 from sugar import activity
 
-from jarabe.model.buddymodel import BuddyModel
-from jarabe.model.accesspointmodel import AccessPointModel
+from jarabe.model.buddy import BuddyModel
+from jarabe.model.accesspoint import AccessPointModel
 from jarabe.model import network
 
 class ActivityModel: