refactor some method names in stack to be more consistent