Change views and files names to be more semantic