renaming and doc comments

1 job for master in 22 minutes and 42 seconds (queued for 14 seconds)