Replace typedef by using