Use updated get_memory var names 

Backport to 2.1