Apply GuiSim review, renamed to use