Solution name re-factored