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

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

diff --git a/sql/cc04/cc5-04.sql b/sql/cc04/cc5-04.sql
index 0865dd108efbf9cb50ab6676c9521c9f0287ea91..e2dca164a716c148473b84a9dd8a718b62c7eca8 100644 (file)
--- a/sql/cc04/cc5-04.sql
+++ b/sql/cc04/cc5-04.sql
@@ -1,47 +1,47 @@
 begin;
 INSERT INTO tournaments 
-  (season, name, country, location, "date", machine, scoringsystem) VALUES (
-    (SELECT season FROM seasons WHERE name='Challenge Cup 2004'),
+  (season, tournamentname, country, location, "date", machine, scoringsystem) VALUES (
+    (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004'),
     'Challenge Cup 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 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 +49,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 +57,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 +66,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 +80,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 +88,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 +97,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 +111,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 +119,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 +128,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 +142,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 +150,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 +159,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 +173,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 +181,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 +190,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 +204,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 +212,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 +220,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 +254,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 +262,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 +271,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 +285,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 +293,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 +302,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 +316,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 +324,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 +333,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 +347,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 +355,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 +364,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 +378,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 +386,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 +395,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 +409,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 +417,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 +425,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 +459,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 +467,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 +476,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 +490,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 +498,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 +507,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 +521,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 +529,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 +538,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 +552,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 +560,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 +569,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 +583,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 +591,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 +600,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 +614,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 +622,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 +630,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 +664,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 +672,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 +681,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 +695,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 +703,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 +712,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 +726,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 +734,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 +743,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 +757,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 +765,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 +774,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 +788,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 +796,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 +805,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 +819,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 +827,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 +835,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 +869,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 +877,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 +886,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 +900,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 +908,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 +917,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 +931,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 +939,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 +948,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 +962,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 +970,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 +979,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 +993,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 +1001,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 +1010,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 +1024,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 +1032,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 +1041,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 +1055,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 +1063,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 +1071,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 +1105,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 +1113,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 +1122,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 +1136,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 +1144,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 +1153,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 +1167,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 +1175,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 +1184,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 +1198,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 +1206,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 +1215,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 +1229,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 +1237,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 +1246,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 +1260,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 +1268,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 +1277,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 +1291,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 +1299,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 +1308,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 +1346,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 +1354,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 +1363,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 +1377,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 +1385,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 +1394,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 +1408,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 +1416,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 +1425,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 +1439,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 +1447,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 +1456,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 +1470,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 +1478,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 +1487,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 +1501,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 +1509,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 +1517,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 +1551,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 +1559,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 +1568,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 +1582,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 +1590,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 +1599,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 +1613,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 +1621,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 +1630,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 +1644,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 +1652,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 +1661,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 +1675,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 +1683,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 +1692,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 +1706,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 +1714,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 +1722,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 +1756,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 +1764,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 +1773,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 +1787,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 +1795,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 +1804,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 +1818,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 +1826,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 +1835,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 +1849,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 +1857,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 +1866,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 +1880,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 +1888,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 +1897,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 +1911,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 +1919,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 +1928,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 +1961,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 +1970,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 +1984,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 +1993,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 +2007,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 +2016,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 +2030,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 +2039,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 +2053,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 +2062,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 +2076,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 +2085,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 +2099,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 +2108,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 +2122,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 +2131,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 +2145,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 +2154,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 +2187,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 +2196,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 +2210,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 +2219,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 +2233,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 +2242,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 +2256,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 +2265,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 +2279,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 +2288,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 +2302,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 +2311,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 +2325,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 +2334,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 +2367,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 +2376,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 +2390,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 +2399,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 +2413,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 +2422,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 +2436,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 +2445,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 +2459,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 +2468,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 +2501,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 +2510,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 +2524,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 +2533,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 +2547,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 +2556,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 +2570,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 +2579,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 +2612,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 +2621,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 +2635,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 +2644,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 +2658,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 +2667,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 +2700,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 +2709,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 +2723,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 +2732,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 +2765,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 +2774,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 +2788,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 +2797,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 +2811,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 +2820,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 +2853,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 +2862,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 +2876,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,