rename some keywords