Better stack rename abstraction