renaming, reordering and changing text for #163