Uniform some typedef. #140