style naming updates and rerangling comp subunit params part 5