#4261 + #4262 Bugzilla - Modification on Nouns for API Standar