renaming according to conventions
more renaming
adding val-timeout
full safety \cc @TiarkRompf