Minor changes for the renames in type-sets lib