more naming conformity to the paper