Rename some thangs
Refactor stack assertion