MAINT, change standard for entrytypes and id

TODO: add note about deprecation.