making stub names more consistent