ENH: Make naming conventions for optimizers consistent

Change-Id: Ie05f3b4809f38429723cf7034f2567440f5dbc85