Use lens>=4 type names, bump deps