[#1415] Bulk update public bodies

Prep work for any action on #1415 
Use 2 (not 4) spaces for indentation.