Rename CommentingPolicy spec to have suffix

Tighten up some lines that dont need to wrap beyond one line.