reverted naming structure in supervisor