Got rid of certain exceptions specific to the naming of toplevel attributes/objects (#1114)
Fixed .src files after changing certain details of toplevel attribute/object naming (#1114)