Rename + first step of integration with views