Better output naming
Better names compliance