Minor naming and style corrections