Rename functions in simulator