diff --git a/stdlib/2/inspect.pyi b/stdlib/2/inspect.pyi
index 192d891c8..a3569346c 100644
--- a/stdlib/2/inspect.pyi
+++ b/stdlib/2/inspect.pyi
@@ -55,8 +55,14 @@ ArgSpec = NamedTuple('ArgSpec', [('args', List[str]),
                                  ('defaults', tuple),
                                  ])
 
+ArgInfo = NamedTuple('ArgInfo', [('args', List[str]),
+                                 ('varargs', Optional[str]),
+                                 ('keywords', Optional[str]),
+                                 ('locals', Dict[str, Any]),
+                                 ])
+
 def getargspec(func: object) -> ArgSpec: ...
-def getargvalues(frame: FrameType) -> ArgSpec: ...
+def getargvalues(frame: FrameType) -> ArgInfo: ...
 def formatargspec(args, varargs=..., varkw=..., defaults=...,
         formatarg=..., formatvarargs=..., formatvarkw=..., formatvalue=...,
         join=...) -> str: ...
@@ -79,12 +85,12 @@ Traceback = NamedTuple(
     ]
 )
 
-_FrameRecord = Tuple[FrameType, str, int, str, List[str], int]
+_FrameInfo = Tuple[FrameType, str, int, str, List[str], int]
 
-def getouterframes(frame: FrameType, context: int = ...) -> List[FrameType]: ...
+def getouterframes(frame: FrameType, context: int = ...) -> List[_FrameInfo]: ...
 def getframeinfo(frame: Union[FrameType, TracebackType], context: int = ...) -> Traceback: ...
-def getinnerframes(traceback: TracebackType, context: int = ...) -> List[FrameType]: ...
+def getinnerframes(traceback: TracebackType, context: int = ...) -> List[_FrameInfo]: ...
 
 def currentframe(depth: int = ...) -> FrameType: ...
-def stack(context: int = ...) -> List[_FrameRecord]: ...
-def trace(context: int = ...) -> List[_FrameRecord]: ...
+def stack(context: int = ...) -> List[_FrameInfo]: ...
+def trace(context: int = ...) -> List[_FrameInfo]: ...