Update comments
Fix old keyword name