renamed values to be more friendly (in views too this time!)