Fix name collision with columns named 'tag' in codegen