Fix hardcoded table names