Standardize on naming of Envy