diff --git a/app/models/ability.rb b/app/models/ability.rb
index 25a7c29..65e356b 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -8,7 +8,7 @@ class Ability
  
   # Available roles
   def self.roles
-    ['admin', 'pupil', 'teacher']
+    ['admin', 'student', 'teacher']
   end
   
   # Prepare roles to show in select inputs etc.
diff --git a/db/migrate/20110217150538_clean_up_roles.rb b/db/migrate/20110217150538_clean_up_roles.rb
new file mode 100644
index 0000000..0a8faae
--- /dev/null
+++ b/db/migrate/20110217150538_clean_up_roles.rb
@@ -0,0 +1,21 @@
+class CleanUpRoles < ActiveRecord::Migration
+  def self.up
+    admins = User.all.select{|user| user.role?('admin')}
+    students = User.all.select{|user| user.role?('student')}
+    teachers = User.all.select{|user| user.role?('teacher')}
+
+    Role.delete_all
+    execute "DELETE FROM roles_users"
+
+    admin = Role.create(:name => 'admin')
+    student = Role.create(:name => 'student')
+    teacher = Role.create(:name => 'teacher')
+
+    admins.map{|user| user.roles << admin; user.save}
+    students.map{|user| user.roles << student; user.save}
+    teachers.map{|user| user.roles << teacher; user.save}
+  end
+
+  def self.down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index de554ea..cc8d9b0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20101214084946) do
+ActiveRecord::Schema.define(:version => 20110217150538) do
 
   create_table "addresses", :force => true do |t|
     t.string  "post_office_box",  :limit => 50