Apply autonym class only to autonyms

Change-Id: I6383b9f4ac1f38f47b06a83bf3b009d2ce584215