Rename functions: __pop_foo() => __discard_foo()