Minor label fix - refs BT#6759
Fix table names prefixes (for all 1.9.* versions) - refs BT#6759