Removed Keyword entity and renamed KeywordNorm to Keyword