Updated Naming (removed some remaining occurences of yagni)
Merge pull request #26 from christophgrotz/master

Updated Naming (removed some remaining occurences of yagni)