Changed reserved words for user/license entities