diff --git a/stdlib/2/__builtin__.pyi b/stdlib/2/__builtin__.pyi
index 9e8b05d283d6..57abccd65ab0 100644
--- a/stdlib/2/__builtin__.pyi
+++ b/stdlib/2/__builtin__.pyi
@@ -1275,24 +1275,24 @@ else:
             *iterables: Iterable[Any]) -> List[_S]: ...
 if sys.version_info >= (3,):
     @overload
-    def max(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
+    def max(_arg1: _T, _arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
     @overload
-    def max(iterable: Iterable[_T], key: Callable[[_T], Any] = ..., default: _T = ...) -> _T: ...
+    def max(_iterable: Iterable[_T], *, key: Callable[[_T], Any] = ..., default: _VT = ...) -> Union[_T, _VT]: ...
 else:
     @overload
-    def max(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
+    def max(_arg1: _T, _arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
     @overload
-    def max(iterable: Iterable[_T], key: Callable[[_T], Any] = ...) -> _T: ...
+    def max(_iterable: Iterable[_T], *, key: Callable[[_T], Any] = ...) -> _T: ...
 if sys.version_info >= (3,):
     @overload
-    def min(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
+    def min(_arg1: _T, _arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
     @overload
-    def min(iterable: Iterable[_T], key: Callable[[_T], Any] = ..., default: _T = ...) -> _T: ...
+    def min(_iterable: Iterable[_T], *, key: Callable[[_T], Any] = ..., default: _VT = ...) -> Union[_T, _VT]: ...
 else:
     @overload
-    def min(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
+    def min(_arg1: _T, _arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
     @overload
-    def min(iterable: Iterable[_T], key: Callable[[_T], Any] = ...) -> _T: ...
+    def min(_iterable: Iterable[_T], *, key: Callable[[_T], Any] = ...) -> _T: ...
 @overload
 def next(i: Iterator[_T]) -> _T: ...
 @overload
diff --git a/stdlib/2and3/builtins.pyi b/stdlib/2and3/builtins.pyi
index 9e8b05d283d6..57abccd65ab0 100644
--- a/stdlib/2and3/builtins.pyi
+++ b/stdlib/2and3/builtins.pyi
@@ -1275,24 +1275,24 @@ else:
             *iterables: Iterable[Any]) -> List[_S]: ...
 if sys.version_info >= (3,):
     @overload
-    def max(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
+    def max(_arg1: _T, _arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
     @overload
-    def max(iterable: Iterable[_T], key: Callable[[_T], Any] = ..., default: _T = ...) -> _T: ...
+    def max(_iterable: Iterable[_T], *, key: Callable[[_T], Any] = ..., default: _VT = ...) -> Union[_T, _VT]: ...
 else:
     @overload
-    def max(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
+    def max(_arg1: _T, _arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
     @overload
-    def max(iterable: Iterable[_T], key: Callable[[_T], Any] = ...) -> _T: ...
+    def max(_iterable: Iterable[_T], *, key: Callable[[_T], Any] = ...) -> _T: ...
 if sys.version_info >= (3,):
     @overload
-    def min(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
+    def min(_arg1: _T, _arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
     @overload
-    def min(iterable: Iterable[_T], key: Callable[[_T], Any] = ..., default: _T = ...) -> _T: ...
+    def min(_iterable: Iterable[_T], *, key: Callable[[_T], Any] = ..., default: _VT = ...) -> Union[_T, _VT]: ...
 else:
     @overload
-    def min(arg1: _T, arg2: _T, *args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
+    def min(_arg1: _T, _arg2: _T, *_args: _T, key: Callable[[_T], Any] = ...) -> _T: ...
     @overload
-    def min(iterable: Iterable[_T], key: Callable[[_T], Any] = ...) -> _T: ...
+    def min(_iterable: Iterable[_T], *, key: Callable[[_T], Any] = ...) -> _T: ...
 @overload
 def next(i: Iterator[_T]) -> _T: ...
 @overload