make subtarget names consistent