diff --git a/.travis.yml b/.travis.yml
index cabf8a0..894d039 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ install:
  - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi
 
 script:
- - coverage run --source=finumber ./test_finumber.py -v
+ - coverage run --source=fino ./test_fino.py -v
 
 after_success:
  - pip install coveralls
diff --git a/README.md b/README.md
index 0b431b3..2b7798a 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-finumbers
-=========
+fino
+====
 
-[![Build Status](https://travis-ci.org/hugovk/finumber.svg?branch=master)](https://travis-ci.org/hugovk/finumber)
-[![Coverage Status](https://coveralls.io/repos/hugovk/finumber/badge.png?branch=master)](https://coveralls.io/r/hugovk/finumber?branch=master)
+[![Build Status](https://travis-ci.org/hugovk/fino.svg?branch=master)](https://travis-ci.org/hugovk/fino)
+[![Coverage Status](https://coveralls.io/repos/hugovk/fino/badge.png?branch=master)](https://coveralls.io/r/hugovk/fino?branch=master)
 
 
 Given an integer, output the Finnish word for that number.
diff --git a/finumber.py b/fino.py
similarity index 100%
rename from finumber.py
rename to fino.py
diff --git a/test_finumber.py b/test_fino.py
similarity index 73%
rename from test_finumber.py
rename to test_fino.py
index bf0431d..16b104f 100644
--- a/test_finumber.py
+++ b/test_fino.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 """
-Unit tests for finumber.py
+Unit tests for fino.py
 """
 from __future__ import print_function, unicode_literals
 try:
@@ -9,214 +9,214 @@
 except ImportError:
     import unittest
 
-import finumber
+import fino
 
 
 class TestIt(unittest.TestCase):
 
     def test_unknown_negative(self):
         number = -123
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "en tiedä")
 
     def test_0(self):
         number = 0
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "nolla")
 
     def test_1(self):
         number = 1
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "yksi")
 
     def test_2(self):
         number = 2
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kaksi")
 
     def test_3(self):
         number = 3
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kolme")
 
     def test_4(self):
         number = 4
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "neljä")
 
     def test_5(self):
         number = 5
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "viisi")
 
     def test_6(self):
         number = 6
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kuusi")
 
     def test_7(self):
         number = 7
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "seitsemän")
 
     def test_8(self):
         number = 8
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kahdeksan")
 
     def test_9(self):
         number = 9
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "yhdeksän")
 
     def test_10(self):
         number = 10
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kymmenen")
 
     def test_11(self):
         number = 11
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "yksitoista")
 
     def test_15(self):
         number = 15
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "viisitoista")
 
     def test_19(self):
         number = 19
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "yhdeksäntoista")
 
     def test_20(self):
         number = 20
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kaksikymmentä")
 
     def test_42(self):
         number = 42
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "neljäkymmentäkaksi")
 
     def test_85(self):
         number = 85
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kahdeksankymmentäviisi")
 
     def test_99(self):
         number = 99
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "yhdeksänkymmentäyhdeksän")
 
     def test_100(self):
         number = 100
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "sata")
 
     def test_101(self):
         number = 101
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "satayksi")
 
     def test_111(self):
         number = 111
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "satayksitoista")
 
     def test_200(self):
         number = 200
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kaksisataa")
 
     def test_827(self):
         number = 827
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kahdeksansataakaksikymmentäseitsemän")
 
     def test_999(self):
         number = 999
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "yhdeksänsataayhdeksänkymmentäyhdeksän")
 
     def test_1000(self):
         number = 1000
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "tuhat")
 
     def test_1001(self):
         number = 1001
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "tuhatyksi")
 
     def test_1234(self):
         number = 1234
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "tuhatkaksisataakolmekymmentäneljä")
 
     def test_2161(self):
         number = 2161
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kaksituhattasatakuusikymmentäyksi")
 
     def test_10000(self):
         number = 10000
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kymmenentuhatta")
 
     def test_26712(self):
         number = 26712
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word,
                          "kaksikymmentäkuusituhattaseitsemänsataakaksitoista")
 
     def test_99999(self):
         number = 99999
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "yhdeksänkymmentäyhdeksäntuhattayhdeksänsataa"
                                "yhdeksänkymmentäyhdeksän")
 
     def test_100000(self):
         number = 100000
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "satatuhatta")
 
     def test_111111(self):
         number = 111111
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "satayksitoistatuhattasatayksitoista")
 
     def test_999999(self):
         number = 999999
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "yhdeksänsataayhdeksänkymmentäyhdeksäntuhatta"
                                "yhdeksänsataayhdeksänkymmentäyhdeksän")
 
     def test_miljoona(self):
         number = 10**6
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "miljoona")
 
     def test_5002010(self):
         number = 5002010
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "viisimiljoonaakaksituhattakymmenen")
 
     def test_999999999(self):
         number = 999999999
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "yhdeksänsataayhdeksänkymmentäyhdeksänmiljoonaa"
                                "yhdeksänsataayhdeksänkymmentäyhdeksäntuhatta"
                                "yhdeksänsataayhdeksänkymmentäyhdeksän")
 
     def test_miljardi(self):
         number = 10**9
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "miljardi")
 
     def test_1234567890(self):
         number = 1234567890
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "miljardi"
                                "kaksisataakolmekymmentäneljämiljoonaa"
                                "viisisataakuusikymmentäseitsemäntuhatta"
@@ -224,7 +224,7 @@ def test_1234567890(self):
 
     def test_287654321004(self):
         number = 287654321004
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kaksisataakahdeksankymmentäseitsemänmiljardia"
                                "kuusisataaviisikymmentäneljämiljoonaa"
                                "kolmesataakaksikymmentäyksituhatta"
@@ -232,43 +232,43 @@ def test_287654321004(self):
 
     def test_biljoona(self):
         number = 10**12
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "biljoona")
 
     def test_2biljoonaa(self):
         number = 2 * 10**12
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kaksibiljoonaa")
 
     def test_4000biljoonaa(self):
         number = 4000 * 10**12
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "neljätuhattabiljoonaa")
 
     def test_googol(self):
         number = 10**100
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "googol")
 
     def test_8googolia(self):
         number = 8 * 10**100 + 1
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kahdeksangoogoliayksi")
 
     def test_sentiljoona(self):
         number = 10**600
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "sentiljoona")
 
     def test_3sentiljoonaa(self):
         number = 3 * 10**600
-        word = finumber.to_finnish(number)
+        word = fino.to_finnish(number)
         self.assertEqual(word, "kolmesentiljoonaa")
 
     def test_range(self):
         # Just check no errors
         for number in range(0, 100000):
-            word = finumber.to_finnish(number)
+            word = fino.to_finnish(number)
             self.assertNotEqual(word, "en tiedä")