rename some type and methods