renaming and null checks in simulator