Now properly formats the algorithm names before handling