Modernizing Commercial Rate Design To Align The Private Benefits Of Distributed Energy Storage With System And Social Welfare