Fix more occurences of 'type'