get slightly more flexibility in the naming convention