Updated friend assembly references for the new naming scheme.