Rename + first step of integration with views
Merge branch 'master' into develop