More renaming to satisfy Eagle