Added more reserved words, fixed detection of duplicate capability names