(#22522) some formatting fixups
(#22522) Use :nodename instead of :name in URIs