Removed 'Lens' suffix from lenses.