Make naming of algorithms more consistent (1/2)

This addresses #218.