Updated with optimizer naming.