Fix for @Name in strip() implementation on the VM (added some refactors)