Fixed name collision
Derric case study.
Merge branch 'master' of https://github.com/tvdstorm/hygienic-transformations-ECOOP14
State machines to Java
Merged conflict.