better code structure for order names