several naming and style(9) fixes