Fixes: #2899 Handling name column the right way