fixes bug in class name- don't merge from php5.2 branch anymore..