Rename views in english
Fix tests