MAINT, change standard for entrytypes and id