Fixed the var names