lib: Fix couple of places in simulator not renamed