Add Automatic-Module-Name to RFC8040 model