Align fields with Apache Commons standards.