Take care of some case-insensitive keywords
Remove bundleUUID and update comment