fix: columns names and order