BS-7436, fix table names