Fix some comment and naming