The last name of the female characters in this series, as well as the male protagonist Youtarou, is Amatsuka (天使); one brother and 19 sisters. I can make the tag change. I'm sure full names are preferable over qualifiers whenever possible.
The only character that seems to not be officially listed with a last name is their mother simply called Mama, so I would have her tag remain as mama_(baby_princess).
Also, I've found the Marie character romanized as
Mari.
A suggestion as well is that the baby_princess character tags with the qualifiers can be aliased into their full name character tags.
Change complete. Any images that need this update that requires a privileged account to see and edit, I can't do those.
Updated