Improve function naming to reflect return parameters and describe more its intention