Use correct utility class replacements.
Merge pull request #29 from martin-helmich/bug-correct-utility-classes

Use correct utility class replacements
Merge remote-tracking branch 'upstream/master' into feature-doctrine-fullmigration