Fix some keywords