Fix for output naming