3 files changed, 21 insertions, 22 deletions
diff --git a/ricky/impattern/__init__.py b/ricky/impattern/__init__.py
index 63a540e..577623e 100755
--- a/ricky/impattern/__init__.py
+++ b/ricky/impattern/__init__.py
@@ -1 +1,12 @@
-from impattern import ImPattern
+from ricky.im import Im
+from ricky.impattern.params import ImPatternParams
+from ricky.config import IMPATTERN_URL
+
+class ImPattern(Im):
+    def __init__(self):
+        self.url = IMPATTERN_URL
+    def params_init(self):
+        new_params = ImPatternParams()
+        #new_params = self.get_from_server()
+        new_params.api = self
+        return new_params
diff --git a/ricky/impattern/impattern.py b/ricky/impattern/impattern.py
deleted file mode 100755
index 577623e..0000000
--- a/ricky/impattern/impattern.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from ricky.im import Im
-from ricky.impattern.params import ImPatternParams
-from ricky.config import IMPATTERN_URL
-
-class ImPattern(Im):
-    def __init__(self):
-        self.url = IMPATTERN_URL
-    def params_init(self):
-        new_params = ImPatternParams()
-        #new_params = self.get_from_server()
-        new_params.api = self
-        return new_params
diff --git a/ricky/impattern/params.py b/ricky/impattern/params.py
index b4a63ae..b2f9253 100644
--- a/ricky/impattern/params.py
+++ b/ricky/impattern/params.py
@@ -1,17 +1,17 @@
 import re
 from ricky.params import Params
 from ricky.param import Param
-from ricky.param.selection import Selection
-from ricky.param.selections import Selections
+from ricky.param.probability import Probability
+from ricky.param.probabilities import Probabilities
 from ricky.param.username import Username
 from ricky.param.imageurl import ImageUrl
 from ricky.param.multiselect import MultiSelect
 
 from ricky.config import PATTERN_BASE_URL
 
-class Pattern_UrlSelection(Selection):
+class Pattern_UrlProbability(Probability):
   def __init__(self, **kwargs):
-    super(Pattern_UrlSelection, self).__init__(**kwargs)
+    super(Pattern_UrlProbability, self).__init__(**kwargs)
   @classmethod
   def from_name(cls, **kwargs):
     formatted = "{}/{}.png".format(PATTERN_BASE_URL, kwargs["value"])
@@ -22,12 +22,12 @@ class ImPatternParams(Params):
         self._params = [
            Username(name="username", required=0),
            ImageUrl(name="image_url", required=1),
-           MultiSelect(name="pattern_url", required=1, selections=pattern_url_selections)
+           MultiSelect(name="pattern_url", required=1, probabilities=pattern_url_probabilities)
         ]
 
-pattern_url_selections = Selections(*[
-  Pattern_UrlSelection.from_name(weight=0, value=i) for i in range(1,100) ] + [
-  Pattern_UrlSelection.from_name(weight=0, value="a{}".format(i)) for i in range(0, 42)
+pattern_url_probabilities = Probabilities(*[
+  Pattern_UrlProbability.from_name(weight=0, value=i) for i in range(1,100) ] + [
+  Pattern_UrlProbability.from_name(weight=0, value="a{}".format(i)) for i in range(0, 42)
 ])
 
-pattern_url_selections.search("a10").weight = 20;
+pattern_url_probabilities.search("a10").weight = 20;