fixed some remapKeyword