Change all instances of "name" to something more sane, to get easy natural joins.

[ccbs] / sql / cc04 / cc4-04.sql

diff --git a/sql/cc04/cc4-04.sql b/sql/cc04/cc4-04.sql
index e44caaa0d00520ff76af5ef6d707e1a3d1a2c9c6..e3f985037f1762cb0a13dfceaf98856fc7b68ecd 100644 (file)
--- a/sql/cc04/cc4-04.sql
+++ b/sql/cc04/cc4-04.sql
@@ -1,47 +1,47 @@
 begin;
 INSERT INTO tournaments 
-  (season, name, country, location, "date", machine, scoringsystem) VALUES (
-    (SELECT season FROM seasons WHERE name='Challenge Cup 2004'),
+  (season, tournamentname, country, location, "date", machine, scoringsystem) VALUES (
+    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004'),
     'Challenge Cup 4',
-    (SELECT country FROM countries WHERE name='Norway'),
+    (SELECT country FROM countries WHERE countryname='Norway'),
     'Askim',
     '2004-08-28',
-    (SELECT machine FROM machines WHERE name='Dancing Stage EuroMix 2'),
-    (SELECT scoringsystem FROM scoringsystems WHERE name='10K Machine score')
+    (SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),
+    (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='10K Machine score')
 );
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Nori Nori Nori'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pål Andre' AS nick WHERE 'Pål Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    0,
@@ -49,7 +49,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5755);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    1,
@@ -57,7 +57,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7439);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pål Andre'),
    2,
@@ -66,13 +66,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7946);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tassen' AS nick WHERE 'Tassen' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tassen'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tassen'),
    0,
@@ -80,7 +80,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5862);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tassen'),
    1,
@@ -88,7 +88,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7465);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Tassen'),
    2,
@@ -97,13 +97,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8018);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -111,7 +111,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6303);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -119,7 +119,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8631);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -128,13 +128,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8233);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Draconia'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Draconia'),
    0,
@@ -142,7 +142,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5607);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Draconia'),
    1,
@@ -150,7 +150,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5191);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Draconia'),
    2,
@@ -159,13 +159,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8169);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -173,7 +173,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6749);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -181,7 +181,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8741);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -189,33 +189,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8874);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Cotton-Eye Joe'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Stomp'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mync' AS nick WHERE 'Mync' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Mync'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Mync'),
    0,
@@ -223,7 +223,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5430);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Mync'),
    1,
@@ -231,7 +231,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5492);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Mync'),
    2,
@@ -240,13 +240,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8444);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Glukko' AS nick WHERE 'Glukko' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glukko'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glukko'),
    0,
@@ -254,7 +254,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    2894);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glukko'),
    1,
@@ -262,7 +262,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3223);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glukko'),
    2,
@@ -271,13 +271,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5806);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -285,7 +285,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6127);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -293,7 +293,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6043);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
@@ -302,13 +302,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8149);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -316,7 +316,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6012);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -324,7 +324,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5709);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -333,13 +333,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8211);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -347,7 +347,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6811);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -355,7 +355,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6585);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -363,33 +363,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8457);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('My Summer Love'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pingo' AS nick WHERE 'Pingo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    0,
@@ -397,7 +397,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7866);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    1,
@@ -405,7 +405,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7709);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    2,
@@ -414,13 +414,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7000);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Jim Andre' AS nick WHERE 'Jim Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    0,
@@ -428,7 +428,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4750);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    1,
@@ -436,7 +436,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6116);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Jim Andre'),
    2,
@@ -445,13 +445,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    732);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Dabi' AS nick WHERE 'Dabi' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Dabi'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Dabi'),
    0,
@@ -459,7 +459,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4556);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Dabi'),
    1,
@@ -467,7 +467,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4005);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Dabi'),
    2,
@@ -476,13 +476,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    4005);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -490,7 +490,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7080);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -498,7 +498,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7509);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -507,13 +507,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7509);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -521,7 +521,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8480);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -529,7 +529,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8664);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -537,33 +537,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8664);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Spin the disc'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mario' AS nick WHERE 'Mario' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Mario'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Mario'),
    0,
@@ -571,7 +571,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5758);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Mario'),
    1,
@@ -579,7 +579,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6465);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Mario'),
    2,
@@ -588,13 +588,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    0);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gogo' AS nick WHERE 'Gogo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Gogo'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Gogo'),
    0,
@@ -602,7 +602,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6758);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Gogo'),
    1,
@@ -610,7 +610,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7512);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Gogo'),
    2,
@@ -619,13 +619,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8708);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ted Kristian' AS nick WHERE 'Ted Kristian' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    0,
@@ -633,7 +633,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5911);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    1,
@@ -641,7 +641,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6985);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ted Kristian'),
    2,
@@ -650,13 +650,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7493);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -664,7 +664,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7250);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -672,7 +672,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6600);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -681,13 +681,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7872);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Smiph' AS nick WHERE 'Smiph' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -695,7 +695,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6036);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -703,7 +703,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6297);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -712,13 +712,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    4416);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -726,7 +726,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8446);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -734,7 +734,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7602);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -742,33 +742,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7739);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Living in America'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Alexxz' AS nick WHERE 'Alexxz' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Alexxz'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Alexxz'),
    0,
@@ -776,7 +776,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4861);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Alexxz'),
    1,
@@ -784,7 +784,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4170);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Alexxz'),
    2,
@@ -793,13 +793,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7512);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zeek' AS nick WHERE 'Zeek' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Zeek'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Zeek'),
    0,
@@ -807,7 +807,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3749);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Zeek'),
    1,
@@ -815,7 +815,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3734);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Zeek'),
    2,
@@ -824,13 +824,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5129);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Bonzo' AS nick WHERE 'Bonzo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Bonzo'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -838,7 +838,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6065);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -846,7 +846,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6185);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Bonzo'),
    2,
@@ -855,13 +855,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8490);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tom'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -869,7 +869,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7240);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -877,7 +877,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7260);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Tom'),
    2,
@@ -886,13 +886,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7512);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Snofox'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -900,7 +900,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6529);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -908,7 +908,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6174);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -917,13 +917,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8424);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -931,7 +931,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6633);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -939,7 +939,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5652);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -947,33 +947,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8612);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('The Centre of the Heart (Stonebridge Club Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('I Want You To Want Me'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ozon' AS nick WHERE 'Ozon' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    0,
@@ -981,7 +981,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5641);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    1,
@@ -989,7 +989,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5089);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    2,
@@ -998,13 +998,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8048);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hyper' AS nick WHERE 'Hyper' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hyper'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hyper'),
    0,
@@ -1012,7 +1012,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4410);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hyper'),
    1,
@@ -1020,7 +1020,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    2831);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Hyper'),
    2,
@@ -1029,13 +1029,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7408);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -1043,7 +1043,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6327);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -1051,7 +1051,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5632);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -1060,13 +1060,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8276);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -1074,7 +1074,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6294);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -1082,7 +1082,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5286);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -1091,13 +1091,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8341);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1105,7 +1105,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6371);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1113,7 +1113,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5369);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -1122,13 +1122,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8253);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Stream' AS nick WHERE 'Stream' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -1136,7 +1136,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6135);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -1144,7 +1144,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5013);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    1, 6,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -1153,37 +1153,37 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7102);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('20th November'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Olemann' AS nick WHERE 'Olemann' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Olemann'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -1191,7 +1191,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6635);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -1199,7 +1199,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5971);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -1208,13 +1208,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8042);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'T|na' AS nick WHERE 'T|na' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1222,7 +1222,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7402);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1230,7 +1230,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6375);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1239,13 +1239,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8274);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Oliyzia' AS nick WHERE 'Oliyzia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1253,7 +1253,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7331);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1261,7 +1261,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6382);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -1270,13 +1270,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8693);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1284,7 +1284,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7448);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -1292,7 +1292,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6233);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -1301,13 +1301,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8801);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -1315,7 +1315,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7500);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -1323,7 +1323,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6317);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    2,
@@ -1332,13 +1332,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8646);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1346,7 +1346,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7792);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1354,7 +1354,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6639);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -1362,33 +1362,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8630);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Electro Tuned (the SubS Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('www.blonde girl (MOMO Mix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Duckling' AS nick WHERE 'Duckling' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -1396,7 +1396,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7990);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -1404,7 +1404,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6324);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -1413,13 +1413,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8347);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Daniil' AS nick WHERE 'Daniil' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Daniil'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -1427,7 +1427,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7982);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -1435,7 +1435,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6286);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -1444,13 +1444,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8179);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mulefisk' AS nick WHERE 'Mulefisk' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    0,
@@ -1458,7 +1458,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8108);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
@@ -1466,7 +1466,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6173);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    2,
@@ -1475,13 +1475,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8113);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1489,7 +1489,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8499);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1497,7 +1497,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6638);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -1506,13 +1506,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8381);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -1520,7 +1520,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8517);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -1528,7 +1528,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6692);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -1537,13 +1537,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8208);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1551,7 +1551,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8348);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1559,7 +1559,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6600);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -1567,33 +1567,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8253);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=2;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tassen' AS nick WHERE 'Tassen' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tassen'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tassen'),
    0,
@@ -1601,7 +1601,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    0);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tassen'),
    1,
@@ -1609,7 +1609,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    0);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Tassen'),
    2,
@@ -1618,13 +1618,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    0);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ylini' AS nick WHERE 'Ylini' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -1632,7 +1632,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7704);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -1640,7 +1640,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8111);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -1649,13 +1649,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8154);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pingo' AS nick WHERE 'Pingo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    0,
@@ -1663,7 +1663,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8440);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    1,
@@ -1671,7 +1671,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8160);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    2,
@@ -1680,13 +1680,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8450);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Gogo' AS nick WHERE 'Gogo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    0,
@@ -1694,7 +1694,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7830);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    1,
@@ -1702,7 +1702,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8385);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    2,
@@ -1711,13 +1711,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8602);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1725,7 +1725,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8488);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1733,7 +1733,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8481);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1742,13 +1742,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8638);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1756,7 +1756,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8747);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1764,7 +1764,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8570);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -1773,32 +1773,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8621);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Love This Feelin\''))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=3;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1806,7 +1806,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7448);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1815,13 +1815,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8790);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pingo' AS nick WHERE 'Pingo' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Pingo'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Pingo'),
    0,
@@ -1829,7 +1829,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6765);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Pingo'),
    1,
@@ -1838,13 +1838,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7998);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Tom' AS nick WHERE 'Tom' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    0,
@@ -1852,7 +1852,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6668);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
@@ -1861,13 +1861,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8185);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -1875,7 +1875,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6994);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -1884,13 +1884,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8791);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1898,7 +1898,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7143);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1907,13 +1907,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8596);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1921,7 +1921,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7175);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -1930,13 +1930,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8451);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1944,7 +1944,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6946);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1953,13 +1953,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8654);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    8
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1967,7 +1967,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7356);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1976,13 +1976,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8639);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    9
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1990,7 +1990,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7433);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1999,32 +1999,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8573);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Cotton-Eye Joe'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=4;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2032,7 +2032,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6555);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2041,13 +2041,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8735);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2055,7 +2055,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6004);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2064,13 +2064,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7993);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2078,7 +2078,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6451);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2087,13 +2087,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8809);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2101,7 +2101,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6422);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2110,13 +2110,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8568);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2124,7 +2124,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6579);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2133,13 +2133,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8769);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2147,7 +2147,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6713);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2156,13 +2156,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8737);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'OJK' AS nick WHERE 'OJK' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2170,7 +2170,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6544);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2179,32 +2179,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8332);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=5;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Nameless' AS nick WHERE 'Nameless' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2212,7 +2212,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7215);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2221,13 +2221,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8271);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2235,7 +2235,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8438);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2244,13 +2244,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8314);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2258,7 +2258,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8547);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2267,13 +2267,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8379);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2281,7 +2281,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8695);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2290,13 +2290,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8812);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2304,7 +2304,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8342);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2313,32 +2313,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8724);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=6;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2346,7 +2346,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8120);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2355,13 +2355,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8701);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haggar' AS nick WHERE 'Haggar' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2369,7 +2369,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8234);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2378,13 +2378,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8563);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2392,7 +2392,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8376);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2401,13 +2401,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8901);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2415,7 +2415,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8784);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2424,32 +2424,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8795);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Living in America'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=7;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'RiChY' AS nick WHERE 'RiChY' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2457,7 +2457,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6581);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2466,13 +2466,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8498);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2480,7 +2480,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6778);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2489,13 +2489,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    9057);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2503,7 +2503,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6776);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2512,32 +2512,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8944);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    8,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    8, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    8, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('www.blonde girl (MOMO Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=8;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 4') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND 
   round=8;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2545,7 +2545,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6883);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2554,13 +2554,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    9510);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'DufF' AS nick WHERE 'DufF' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2568,7 +2568,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6436);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 4'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,