Allow single stepping thread and clean up names