Further name updates

continued to update the GC name across _include files