OP-1222 Renamed some pages. Added support for both esc and servo types.