Some notations changed in general, stream and temp collections