Improved custom streams namespaceing.