With the new stack hack macros, there's no need to shorten the names