OLYEN: Corrections

Correction of collision errors. Correction of confusing names.