Replace another hardcoded "OpenSim" that I missed
split common control methods into separate module