Fixed MreSoun bugs with var naming