etap renamed to stage everywhere