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

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

diff --git a/sql/cc04/cc6-04.sql b/sql/cc04/cc6-04.sql
index d2faed57e7aa003a4adb38b2fad807caeeb26d3a..66b85fb95c5564b53952e4e9b3ea2c4119bd368d 100644 (file)
--- a/sql/cc04/cc6-04.sql
+++ b/sql/cc04/cc6-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 6',
-    (SELECT country FROM countries WHERE name='Norway'),
+    (SELECT country FROM countries WHERE countryname='Norway'),
     'Fredrikstad Mestern Bowling',
     '2004-10-24',
-    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Love This Feelin\''))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Make A Jam!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pyro' AS nick WHERE 'Pyro' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pyro'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pyro'),
    0,
@@ -49,7 +49,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5540);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pyro'),
    1,
@@ -57,7 +57,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5501);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Pyro'),
    2,
@@ -66,13 +66,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7419);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Th0rny' AS nick WHERE 'Th0rny' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    0,
@@ -80,7 +80,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6512);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    1,
@@ -88,7 +88,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6227);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Th0rny'),
    2,
@@ -97,13 +97,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8128);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Glukko' AS nick WHERE 'Glukko' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Glukko'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Glukko'),
    0,
@@ -111,7 +111,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4245);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Glukko'),
    1,
@@ -119,7 +119,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5710);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Glukko'),
    2,
@@ -128,13 +128,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6217);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -142,7 +142,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6454);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -150,7 +150,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6776);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -159,13 +159,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7682);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -173,7 +173,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6948);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -181,7 +181,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6685);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -190,13 +190,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7879);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -204,7 +204,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7506);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -212,7 +212,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7370);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -220,33 +220,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7850);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Higher'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Groove 2001'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Glock' AS nick WHERE 'Glock' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glock'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glock'),
    0,
@@ -254,7 +254,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4122);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glock'),
    1,
@@ -262,7 +262,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4862);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Glock'),
    2,
@@ -271,13 +271,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6209);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Athena'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Athena'),
    0,
@@ -285,7 +285,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4533);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Athena'),
    1,
@@ -293,7 +293,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4915);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Athena'),
    2,
@@ -302,13 +302,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6770);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Matsi' AS nick WHERE 'Matsi' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    0,
@@ -316,7 +316,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5130);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    1,
@@ -324,7 +324,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6092);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Matsi'),
    2,
@@ -333,13 +333,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8000);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Bonzo'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -347,7 +347,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6490);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -355,7 +355,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6430);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Bonzo'),
    2,
@@ -364,13 +364,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8087);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -378,7 +378,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5325);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -386,7 +386,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5959);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 2,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -395,13 +395,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8164);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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',
    6723);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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',
    6834);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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',
    7948);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('DXY!'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Ifrit' AS nick WHERE 'Ifrit' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ifrit'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ifrit'),
    0,
@@ -459,7 +459,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    3057);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ifrit'),
    1,
@@ -467,7 +467,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4486);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Ifrit'),
    2,
@@ -476,13 +476,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6459);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'ViD' AS nick WHERE 'ViD' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='ViD'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='ViD'),
    0,
@@ -490,7 +490,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8517);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='ViD'),
    1,
@@ -498,7 +498,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6820);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='ViD'),
    2,
@@ -507,13 +507,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8600);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Hyper' AS nick WHERE 'Hyper' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Hyper'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Hyper'),
    0,
@@ -521,7 +521,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7935);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Hyper'),
    1,
@@ -529,7 +529,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5109);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Hyper'),
    2,
@@ -538,13 +538,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7931);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Andeplane'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Andeplane'),
    0,
@@ -552,7 +552,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7938);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Andeplane'),
    1,
@@ -560,7 +560,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5713);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Andeplane'),
    2,
@@ -569,13 +569,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8175);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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',
    8841);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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',
    7573);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Gogo'),
    2,
@@ -600,13 +600,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7759);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Duckling'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Duckling'),
    0,
@@ -614,7 +614,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8650);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Duckling'),
    1,
@@ -622,7 +622,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6988);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='Duckling'),
    2,
@@ -631,13 +631,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7904);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -645,7 +645,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8893);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -653,7 +653,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7599);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -661,33 +661,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7661);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Luv to Me (AMD Mix)'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT song FROM songs WHERE lower(title)=lower('Nori Nori Nori'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Electron' AS nick WHERE 'Electron' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Electron'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Electron'),
    0,
@@ -695,7 +695,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5545);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Electron'),
    1,
@@ -703,7 +703,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5420);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Electron'),
    2,
@@ -712,13 +712,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7443);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Guru' AS nick WHERE 'Guru' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Guru'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Guru'),
    0,
@@ -726,7 +726,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5318);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Guru'),
    1,
@@ -734,7 +734,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4598);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Guru'),
    2,
@@ -743,13 +743,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    4905);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Annkakri' AS nick WHERE 'Annkakri' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Annkakri'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Annkakri'),
    0,
@@ -757,7 +757,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4415);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Annkakri'),
    1,
@@ -765,7 +765,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4341);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Annkakri'),
    2,
@@ -774,13 +774,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6245);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Felz'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Felz'),
    0,
@@ -788,7 +788,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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Felz'),
    1,
@@ -796,7 +796,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5600);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Felz'),
    2,
@@ -805,13 +805,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8080);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Draconia' AS nick WHERE 'Draconia' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    0,
@@ -819,7 +819,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5075);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    1,
@@ -827,7 +827,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6218);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Draconia'),
    2,
@@ -836,13 +836,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7977);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -850,7 +850,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6801);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -858,7 +858,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5958);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -867,13 +867,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7425);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Haggar'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -881,7 +881,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7178);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -889,7 +889,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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 4,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -897,33 +897,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    7973);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Let the Beat Hit \'em!'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT song FROM songs WHERE lower(title)=lower('Living in America'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Goku' AS nick WHERE 'Goku' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Goku'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Goku'),
    0,
@@ -931,7 +931,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5857);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Goku'),
    1,
@@ -939,7 +939,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5900);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Goku'),
    2,
@@ -948,13 +948,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8359);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Montana' AS nick WHERE 'Montana' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Montana'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Montana'),
    0,
@@ -962,7 +962,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5411);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Montana'),
    1,
@@ -970,7 +970,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4624);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Montana'),
    2,
@@ -979,13 +979,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6637);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'JonAnders' AS nick WHERE 'JonAnders' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='JonAnders'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='JonAnders'),
    0,
@@ -993,7 +993,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4643);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='JonAnders'),
    1,
@@ -1001,7 +1001,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4202);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='JonAnders'),
    2,
@@ -1010,13 +1010,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    5502);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Alexxz'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Alexxz'),
    0,
@@ -1024,7 +1024,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6074);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Alexxz'),
    1,
@@ -1032,7 +1032,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6053);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Alexxz'),
    2,
@@ -1041,13 +1041,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7984);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Pingo'),
    0,
@@ -1055,7 +1055,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6413);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Pingo'),
    1,
@@ -1063,7 +1063,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6100);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Pingo'),
    2,
@@ -1072,13 +1072,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8393);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -1086,7 +1086,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6518);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -1094,7 +1094,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6543);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -1103,13 +1103,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8218);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='RiChY'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1117,7 +1117,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5975);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1125,7 +1125,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5993);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 5,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1133,33 +1133,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8380);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT song FROM songs WHERE lower(title)=lower('20th November'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=1;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Matti' AS nick WHERE 'Matti' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Matti'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Matti'),
    0,
@@ -1167,7 +1167,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6024);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Matti'),
    1,
@@ -1175,7 +1175,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5382);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Matti'),
    2,
@@ -1184,13 +1184,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6848);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'v|per' AS nick WHERE 'v|per' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='v|per'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='v|per'),
    0,
@@ -1198,7 +1198,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5783);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='v|per'),
    1,
@@ -1206,7 +1206,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5011);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='v|per'),
    2,
@@ -1215,13 +1215,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    6587);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Zackie' AS nick WHERE 'Zackie' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Zackie'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Zackie'),
    0,
@@ -1229,7 +1229,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5507);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Zackie'),
    1,
@@ -1237,7 +1237,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4324);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Zackie'),
    2,
@@ -1246,13 +1246,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7930);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Mync'),
    0,
@@ -1260,7 +1260,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6750);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Mync'),
    1,
@@ -1268,7 +1268,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5565);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Mync'),
    2,
@@ -1277,13 +1277,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8405);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    0,
@@ -1291,7 +1291,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7482);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    1,
@@ -1299,7 +1299,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5751);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Ozon'),
    2,
@@ -1308,13 +1308,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7400);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1322,7 +1322,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7036);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1330,7 +1330,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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1339,13 +1339,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8174);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1353,7 +1353,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7381);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1361,7 +1361,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6500);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    1, 6,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -1370,37 +1370,37 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8217);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Hysteria 2001'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT song FROM songs WHERE lower(title)=lower('Rain of Sorrow'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=2;
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    0,
@@ -1408,7 +1408,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6540);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    1,
@@ -1416,7 +1416,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7085);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Daniil'),
    2,
@@ -1425,13 +1425,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8642);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'ViD' AS nick WHERE 'ViD' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='ViD'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='ViD'),
    0,
@@ -1439,7 +1439,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6437);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='ViD'),
    1,
@@ -1447,7 +1447,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7492);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='ViD'),
    2,
@@ -1456,13 +1456,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8193);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -1470,7 +1470,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6534);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -1478,7 +1478,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7877);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    2,
@@ -1487,13 +1487,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8246);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -1501,7 +1501,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6464);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -1509,7 +1509,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7370);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Bonzo'),
    2,
@@ -1518,13 +1518,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8578);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -1532,7 +1532,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6899);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -1540,7 +1540,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8498);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Snute'),
    2,
@@ -1549,13 +1549,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7791);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Gogo'),
    0,
@@ -1563,7 +1563,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6182);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Gogo'),
    1,
@@ -1571,7 +1571,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6574);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 1,
    (SELECT player FROM players WHERE nick='Gogo'),
    2,
@@ -1579,33 +1579,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8746);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Memories'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT song FROM songs WHERE lower(title)=lower('Keep On Movin\''))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=2;
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='Felz'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='Felz'),
    0,
@@ -1613,7 +1613,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5421);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='Felz'),
    1,
@@ -1621,7 +1621,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5171);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='Felz'),
    2,
@@ -1630,13 +1630,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7990);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='Mync'),
    0,
@@ -1644,7 +1644,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5685);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='Mync'),
    1,
@@ -1652,7 +1652,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    4738);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='Mync'),
    2,
@@ -1661,13 +1661,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7743);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -1675,7 +1675,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6952);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -1683,7 +1683,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6567);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
@@ -1692,13 +1692,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8418);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    0,
@@ -1706,7 +1706,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6339);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    1,
@@ -1714,7 +1714,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5690);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='T|na'),
    2,
@@ -1723,13 +1723,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8644);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -1737,7 +1737,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7547);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -1745,7 +1745,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6182);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='DufF'),
    2,
@@ -1754,13 +1754,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8377);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -1768,7 +1768,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7228);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -1776,7 +1776,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5429);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 2,
    (SELECT player FROM players WHERE nick='Nameless'),
    2,
@@ -1784,33 +1784,33 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    't',
    8230);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('End of the Century'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=2;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=2;
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Smiph'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Smiph'),
    0,
@@ -1818,7 +1818,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6286);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Smiph'),
    1,
@@ -1826,7 +1826,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7291);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Smiph'),
    2,
@@ -1835,13 +1835,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8168);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    0,
@@ -1849,7 +1849,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7500);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    1,
@@ -1857,7 +1857,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8560);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='RiChY'),
    2,
@@ -1866,13 +1866,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7971);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -1880,7 +1880,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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -1888,7 +1888,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8719);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Snofox'),
    2,
@@ -1897,13 +1897,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8686);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    0,
@@ -1911,7 +1911,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7920);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    1,
@@ -1919,7 +1919,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8333);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Pingo'),
    2,
@@ -1928,13 +1928,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8544);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -1942,7 +1942,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8713);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -1950,7 +1950,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8720);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Haggar'),
    2,
@@ -1959,13 +1959,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8793);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -1973,7 +1973,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8307);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -1981,7 +1981,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8545);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    2, 3,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    2,
@@ -1990,32 +1990,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8190);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 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 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=3;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=3;
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2023,7 +2023,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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2032,13 +2032,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8627);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2046,7 +2046,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8296);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2055,13 +2055,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8550);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Bonzo'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Bonzo'),
    0,
@@ -2069,7 +2069,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8207);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Bonzo'),
    1,
@@ -2078,13 +2078,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8133);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Ylini'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Ylini'),
    0,
@@ -2092,7 +2092,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8015);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
@@ -2101,13 +2101,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8414);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2115,7 +2115,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8704);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2124,13 +2124,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8635);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    6
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2138,7 +2138,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8494);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2147,13 +2147,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8459);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    7
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2161,7 +2161,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8755);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2170,13 +2170,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8367);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    8
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2184,7 +2184,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8769);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2193,13 +2193,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8743);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    9
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2207,7 +2207,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    8631);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    3, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2216,32 +2216,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8251);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=4;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=4;
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    0,
@@ -2249,7 +2249,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6585);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Nameless'),
    1,
@@ -2258,13 +2258,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8675);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2272,7 +2272,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7296);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2281,13 +2281,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8557);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    0,
@@ -2295,7 +2295,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6862);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
@@ -2304,13 +2304,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8753);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2318,7 +2318,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6871);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2327,13 +2327,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8802);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2341,7 +2341,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6848);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2350,13 +2350,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8826);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2364,7 +2364,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7316);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2373,13 +2373,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8493);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2387,7 +2387,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7651);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    4, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2396,32 +2396,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8673);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('The Centre of the Heart (Stonebridge Club Mix)'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=5;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=5;
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2429,7 +2429,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6649);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2438,13 +2438,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8825);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2452,7 +2452,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6860);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2461,13 +2461,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8636);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2475,7 +2475,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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2484,13 +2484,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8868);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    4
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    0,
@@ -2498,7 +2498,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6652);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='Oliyzia'),
    1,
@@ -2507,13 +2507,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8169);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snute' AS nick WHERE 'Snute' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    5
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2521,7 +2521,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6675);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    5, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2530,32 +2530,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8939);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Secret Rendez-vous'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=6;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=6;
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2563,7 +2563,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5446);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2572,13 +2572,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8499);
 INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Snofox' AS nick WHERE 'Snofox' NOT IN ( SELECT nick FROM players );
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    0,
@@ -2586,7 +2586,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5477);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snofox'),
    1,
@@ -2595,13 +2595,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8241);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2609,7 +2609,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6489);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2618,13 +2618,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8776);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2632,7 +2632,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6480);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    6, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2641,32 +2641,32 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8849);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Memories'))
 );
 UPDATE rounds SET randomsongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=7;
 UPDATE rounds SET chosensongs=1 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') AND 
   round=7;
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    0,
@@ -2674,7 +2674,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7282);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
@@ -2683,13 +2683,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8841);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    2
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2697,7 +2697,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7327);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2706,13 +2706,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8803);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    3
 );
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2720,7 +2720,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    7717);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    7, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,
@@ -2729,34 +2729,34 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    8717);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 
   VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    8,
    0, 0);
 INSERT INTO groups (tournament, round, parallel) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    8, 0);
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    8, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Destiny'))
 );
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    8, 0,
    (SELECT song FROM songs WHERE lower(title)=lower('Max 300'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
-  tournament=(SELECT tournament FROM tournaments WHERE name='Challenge Cup 6') AND 
+  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6') 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    0,
@@ -2764,7 +2764,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    5834);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    8, 0,
    (SELECT player FROM players WHERE nick='DufF'),
    1,
@@ -2773,13 +2773,13 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    9140);
 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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    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 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    0,
@@ -2787,7 +2787,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    'f',
    6579);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
-   (SELECT tournament FROM tournaments WHERE name='Challenge Cup 6'),
+   (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 6'),
    8, 0,
    (SELECT player FROM players WHERE nick='Snute'),
    1,