Merge pull request #1 from ipa-mig/groovy_dev

fixing some bugs from renaming
another bugfix to avoid build-error