added support for custom order names