Fix some naming inconsistencies
Support for zend opcache