Modified annotation parameter names and added missing qualifier
extraction.