make naming of lenses less confusing
follow up on lens renaming