Fixed horrible Kingdom of Nouns naming ;-)
Using better naming convention