Rather than shortname/institution pair

Need to fix up how mysqli checks for index when table name
is reserved word

behatnotneeded - existing test should be ok

Change-Id: I62e776a5497671f9455929a21d279f76cf3f4345
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>