Update the parser scripts to handle tournament rankings, and fix a typo in the SQL...

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

diff --git a/sql/cc04/cc5-04.sql b/sql/cc04/cc5-04.sql
index 0865dd108efbf9cb50ab6676c9521c9f0287ea91..1c0e83444ac87de8a63226e9f5080f7c60c200b0 100644 (file)
--- a/sql/cc04/cc5-04.sql
+++ b/sql/cc04/cc5-04.sql
@@ -1,47 +1,161 @@
 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 5 - NM',
-    (SELECT country FROM countries WHERE name='Norway'),
+    (SELECT country FROM countries WHERE countryname='Norway'),
     'OsloLan',
     '2004-10-02',
-    (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 tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   1, 'Snute', 200);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   2, 'DufF', 180);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   3, 'Haggar', 162);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   4, 'OJK', 146);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   5, 'RiChY', 132);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   6, 'Nameless', 120);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   7, 'Gogo', 110);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   8, 'T|na', 102);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   9, 'Pingo', 96);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   10, 'Daniil', 92);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   11, 'Duckling', 90);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   12, 'Oliyzia', 0);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   13, 'Bonzo', 86);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   14, 'Stream', 84);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   15, 'Olemann', 82);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   16, 'Ozon', 80);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   17, 'Mync', 78);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   18, 'Ylini', 0);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   19, 'Smiph', 0);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   20, 'Cuivien', 72);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   21, 'Haanz', 70);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   22, 'Felz', 68);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   23, 'Cehtna', 66);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   24, 'Andeplane', 64);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   25, 'Alexxz', 62);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   26, 'Asphodel', 60);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   27, 'Havok', 58);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   28, 'Zeila', 56);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   29, 'Ngan', 54);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   30, 'Andre', 52);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   31, 'Lindaninja', 50);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   32, 'Eruanna', 48);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   33, 'Ingviild', 46);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   34, 'Marilla', 44);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   35, 'Mickva', 42);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   36, 'Chimera', 40);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   37, 'Maxion', 38);
+INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
+   38, 'Athena', 36);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Healing Vision (Angelic Mix)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Eruanna' AS nick WHERE 'Eruanna' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Eruanna'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Eruanna'),
    0,
@@ -49,7 +163,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4721);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Eruanna'),
    1,
@@ -57,7 +171,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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Eruanna'),
    2,
@@ -66,13 +180,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6966);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Andeplane' AS nick WHERE 'Andeplane' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
    0,
@@ -80,7 +194,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5019);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
    1,
@@ -88,7 +202,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6152);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Andeplane'),
    2,
@@ -97,13 +211,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7108);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zeila' AS nick WHERE 'Zeila' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Zeila'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Zeila'),
    0,
@@ -111,7 +225,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5066);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Zeila'),
    1,
@@ -119,7 +233,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5352);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Zeila'),
    2,
@@ -128,13 +242,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7198);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -142,7 +256,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6156);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -150,7 +264,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7590);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -159,13 +273,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8352);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -173,7 +287,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5813);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -181,7 +295,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6831);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    2,
@@ -190,13 +304,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7766);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -204,7 +318,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6444);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -212,7 +326,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7576);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -220,33 +334,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7626);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Chimera' AS nick WHERE 'Chimera' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Chimera'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Chimera'),
    0,
@@ -254,7 +368,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5567);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Chimera'),
    1,
@@ -262,7 +376,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4361);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Chimera'),
    2,
@@ -271,13 +385,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5565);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
    0,
@@ -285,7 +399,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5491);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
    1,
@@ -293,7 +407,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6262);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Alexxz'),
    2,
@@ -302,13 +416,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7712);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -316,7 +430,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6086);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -324,7 +438,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6603);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -333,13 +447,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8273);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -347,7 +461,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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -355,7 +469,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7596);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -364,13 +478,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7879);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pingo'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pingo'),
    0,
@@ -378,7 +492,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6255);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pingo'),
    1,
@@ -386,7 +500,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7084);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='Pingo'),
    2,
@@ -395,13 +509,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8287);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -409,7 +523,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6772);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -417,7 +531,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8406);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -425,33 +539,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7950);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Let Them Move'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Mickva' AS nick WHERE 'Mickva' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mickva'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mickva'),
    0,
@@ -459,7 +573,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4465);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mickva'),
    1,
@@ -467,7 +581,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4028);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mickva'),
    2,
@@ -476,13 +590,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5991);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Havok' AS nick WHERE 'Havok' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    0,
@@ -490,7 +604,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4920);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    1,
@@ -498,7 +612,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4843);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Havok'),
    2,
@@ -507,13 +621,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7321);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Felz' AS nick WHERE 'Felz' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    0,
@@ -521,7 +635,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5808);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    1,
@@ -529,7 +643,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5815);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Felz'),
    2,
@@ -538,13 +652,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7912);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mync'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mync'),
    0,
@@ -552,7 +666,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5263);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mync'),
    1,
@@ -560,7 +674,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5942);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Mync'),
    2,
@@ -569,13 +683,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8607);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    0,
@@ -583,7 +697,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6737);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    1,
@@ -591,7 +705,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6570);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    2,
@@ -600,13 +714,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7713);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -614,7 +728,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7205);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -622,7 +736,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6463);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 3,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -630,33 +744,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7926);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Let the Beat Hit \'em!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ingviild' AS nick WHERE 'Ingviild' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ingviild'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ingviild'),
    0,
@@ -664,7 +778,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5859);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ingviild'),
    1,
@@ -672,7 +786,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4881);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ingviild'),
    2,
@@ -681,13 +795,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6608);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ngan' AS nick WHERE 'Ngan' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ngan'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ngan'),
    0,
@@ -695,7 +809,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6613);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ngan'),
    1,
@@ -703,7 +817,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5443);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ngan'),
    2,
@@ -712,13 +826,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5594);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Cuivien' AS nick WHERE 'Cuivien' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Cuivien'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Cuivien'),
    0,
@@ -726,7 +840,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7812);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Cuivien'),
    1,
@@ -734,7 +848,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6291);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Cuivien'),
    2,
@@ -743,13 +857,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8215);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -757,7 +871,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8313);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -765,7 +879,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6442);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -774,13 +888,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8048);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Olemann'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -788,7 +902,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8573);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -796,7 +910,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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -805,13 +919,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8156);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -819,7 +933,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7958);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -827,7 +941,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6351);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 4,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -835,33 +949,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8482);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Tsugaru'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Crash!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Maxion' AS nick WHERE 'Maxion' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Maxion'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Maxion'),
    0,
@@ -869,7 +983,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5747);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Maxion'),
    1,
@@ -877,7 +991,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6617);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Maxion'),
    2,
@@ -886,13 +1000,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5844);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Lindaninja' AS nick WHERE 'Lindaninja' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Lindaninja'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Lindaninja'),
    0,
@@ -900,7 +1014,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6165);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Lindaninja'),
    1,
@@ -908,7 +1022,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6631);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Lindaninja'),
    2,
@@ -917,13 +1031,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7569);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Asphodel' AS nick WHERE 'Asphodel' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Asphodel'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Asphodel'),
    0,
@@ -931,7 +1045,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7341);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Asphodel'),
    1,
@@ -939,7 +1053,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6061);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Asphodel'),
    2,
@@ -948,13 +1062,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7656);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Cehtna' AS nick WHERE 'Cehtna' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Cehtna'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Cehtna'),
    0,
@@ -962,7 +1076,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7809);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Cehtna'),
    1,
@@ -970,7 +1084,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7520);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Cehtna'),
    2,
@@ -979,13 +1093,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7030);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -993,7 +1107,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8235);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1001,7 +1115,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7930);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1010,13 +1124,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7759);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Ylini'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -1024,7 +1138,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8154);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -1032,7 +1146,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7758);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -1041,13 +1155,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7463);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1055,7 +1169,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8580);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1063,7 +1177,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8478);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 5,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -1071,33 +1185,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8195);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('La Senorita'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('Afronova'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Athena' AS nick WHERE 'Athena' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Athena'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Athena'),
    0,
@@ -1105,7 +1219,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4975);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Athena'),
    1,
@@ -1113,7 +1227,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5292);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Athena'),
    2,
@@ -1122,13 +1236,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6141);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Andre' AS nick WHERE 'Andre' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Andre'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Andre'),
    0,
@@ -1136,7 +1250,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5503);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Andre'),
    1,
@@ -1144,7 +1258,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5618);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Andre'),
    2,
@@ -1153,13 +1267,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6345);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Marilla' AS nick WHERE 'Marilla' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
    0,
@@ -1167,7 +1281,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5338);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
    1,
@@ -1175,7 +1289,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5008);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Marilla'),
    2,
@@ -1184,13 +1298,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6534);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    0,
@@ -1198,7 +1312,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6040);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    1,
@@ -1206,7 +1320,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6589);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    2,
@@ -1215,13 +1329,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8005);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Haanz' AS nick WHERE 'Haanz' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Haanz'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Haanz'),
    0,
@@ -1229,7 +1343,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4809);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Haanz'),
    1,
@@ -1237,7 +1351,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6176);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Haanz'),
    2,
@@ -1246,13 +1360,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7953);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -1260,7 +1374,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6040);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -1268,7 +1382,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8064);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -1277,13 +1391,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7648);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1291,7 +1405,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6274);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1299,7 +1413,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7686);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -1308,37 +1422,37 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7587);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Exotic Ethnic'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Hypnotic Crisis'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -1346,7 +1460,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8122);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -1354,7 +1468,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7553);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    2,
@@ -1363,13 +1477,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8550);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
    0,
@@ -1377,7 +1491,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7831);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
    1,
@@ -1385,7 +1499,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7442);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Mync'),
    2,
@@ -1394,13 +1508,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8239);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1408,7 +1522,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8742);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1416,7 +1530,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8478);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -1425,13 +1539,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8785);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -1439,7 +1553,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8218);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -1447,7 +1561,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7626);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -1456,13 +1570,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8773);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1470,7 +1584,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8734);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1478,7 +1592,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8640);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -1487,13 +1601,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8773);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1501,7 +1615,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8692);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1509,7 +1623,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7952);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 1,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -1517,33 +1631,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8653);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Silent Hill'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Don\'t Try to Stop It'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ozon'),
    0,
@@ -1551,7 +1665,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6062);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ozon'),
    1,
@@ -1559,7 +1673,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6369);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Ozon'),
    2,
@@ -1568,13 +1682,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8251);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1582,7 +1696,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6416);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1590,7 +1704,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6971);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1599,13 +1713,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8504);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1613,7 +1727,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6535);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1621,7 +1735,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6863);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -1630,13 +1744,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8476);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1644,7 +1758,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6705);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1652,7 +1766,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6938);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1661,13 +1775,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8378);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -1675,7 +1789,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6565);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -1683,7 +1797,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7037);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -1692,13 +1806,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8454);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    0,
@@ -1706,7 +1820,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6181);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    1,
@@ -1714,7 +1828,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6748);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 2,
    (SELECT player FROM players WHERE nick='Olemann'),
    2,
@@ -1722,33 +1836,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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=2;
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -1756,7 +1870,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5689);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -1764,7 +1878,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8037);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -1773,13 +1887,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8235);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    0,
@@ -1787,7 +1901,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6172);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    1,
@@ -1795,7 +1909,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8011);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    2,
@@ -1804,13 +1918,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8558);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    0,
@@ -1818,7 +1932,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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    1,
@@ -1826,7 +1940,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8240);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    2,
@@ -1835,13 +1949,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8820);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -1849,7 +1963,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5960);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -1857,7 +1971,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8158);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -1866,13 +1980,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8486);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    0,
@@ -1880,7 +1994,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6287);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    1,
@@ -1888,7 +2002,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7795);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='Stream'),
    2,
@@ -1897,13 +2011,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8495);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1911,7 +2025,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6870);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1919,7 +2033,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8658);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    2, 3,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -1928,32 +2042,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8677);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dead End'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=3;
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1961,7 +2075,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8665);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1970,13 +2084,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8561);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Pingo'),
    0,
@@ -1984,7 +2098,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8071);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Pingo'),
    1,
@@ -1993,13 +2107,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8262);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2007,7 +2121,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8651);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2016,13 +2130,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8731);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -2030,7 +2144,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7787);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -2039,13 +2153,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8652);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2053,7 +2167,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8492);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2062,13 +2176,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8654);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
    0,
@@ -2076,7 +2190,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8267);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
    1,
@@ -2085,13 +2199,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8734);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2099,7 +2213,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8565);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2108,13 +2222,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8643);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    8
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2122,7 +2236,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8580);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2131,13 +2245,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8693);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    9
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2145,7 +2259,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8805);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2154,32 +2268,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8819);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Burnin\' the Floor'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=4;
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
    0,
@@ -2187,7 +2301,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6387);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Gogo'),
    1,
@@ -2196,13 +2310,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7925);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2210,7 +2324,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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2219,13 +2333,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8820);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2233,7 +2347,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6593);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2242,13 +2356,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8561);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2256,7 +2370,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6498);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2265,13 +2379,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8723);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2279,7 +2393,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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2288,13 +2402,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8606);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2302,7 +2416,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6536);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2311,13 +2425,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8855);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2325,7 +2439,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6884);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2334,32 +2448,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8757);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Vanity Angel'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=5;
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -2367,7 +2481,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7858);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -2376,13 +2490,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8472);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2390,7 +2504,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8682);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2399,13 +2513,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8800);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2413,7 +2527,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8257);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2422,13 +2536,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8754);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2436,7 +2550,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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2445,13 +2559,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8766);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2459,7 +2573,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8403);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    5, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2468,32 +2582,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8604);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Rain of Sorrow'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=6;
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2501,7 +2615,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8198);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2510,13 +2624,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    9195);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2524,7 +2638,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7744);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2533,13 +2647,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8691);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2547,7 +2661,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8365);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2556,13 +2670,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8600);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2570,7 +2684,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8455);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2579,32 +2693,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8875);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Dynamite Rave'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=7;
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2612,7 +2726,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8550);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2621,13 +2735,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8972);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2635,7 +2749,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8763);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2644,13 +2758,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8905);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2658,7 +2772,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8516);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    7, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2667,32 +2781,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8070);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Hysteria 2001'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=8;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=8;
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2700,7 +2814,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6621);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2709,13 +2823,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8891);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2723,7 +2837,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6634);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2732,32 +2846,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    9672);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Higher'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=9;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=9;
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Ylini'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -2765,7 +2879,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5271);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -2774,13 +2888,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7905);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2788,7 +2902,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5683);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2797,13 +2911,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8381);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -2811,7 +2925,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5509);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    9, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -2820,32 +2934,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8471);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love (SPEED MIX)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=10;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM') AND 
   round=10;
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -2853,7 +2967,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8343);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -2862,13 +2976,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8674);
 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 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2876,7 +2990,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8013);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 5 - NM'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 5 - NM'),
    10, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,