Rename classes to align more with bibframe et al