reorder @param type and name
more reordering of @param name type