Renaming to follow processing convention