Typo fix & var rename