Fixed Zend style violations
Fixed Zend style violations
Renamed variables
Fixed Zend style violations
Fixed Zend style violations
Merge pull request #1395 from benjamij/zend-style-fixes

Zend style fixes