Removed namespace from entity keywords.