Fix bug with keyword name