Sorted strings in logical order

and renamed some