More naming updates

* StreamWrapper.ElementFactory instead of global now