swapped some 'name' for 'id' and 'descr' for 'name'