Fix naming and typo