optimizer: make some function name straightforward