prepare for deprecating correlation functions with solver name in function name
docstring fixes