v2.5.1 beta4

Rolled back some names.