Fixed some naming
Merge branch 'redesign_next' of github.com:zhdk/madek into redesign_next