rename some struct