[Issue Description] A new keyword, KPI, has been introduced to the CREATE KPI command. If existing objects have the name KPI, then the new keyword will conflict with them. [Issue Type] 
The CREATE KPI Command Introduces a New Keyword