more inspection tidyups and naming standardization