Fixing some keyword naming bugs