more tidyups on conf naming