Invoke #column_name when available, use #name otherwise

Thanks @cupakromer for the suggestion