review - improved misc naming conventions