Fix incorrect var names