output naming fixes