rename a few variables
fix issue on Simulator