Refactoring for WC 2.1.9: fixed customer name issue