Removed unneccesary suffixing of component names
Merge branch 'development' of https://github.com/jpwesselink/slush-freak into development