[HPT-264] Clean up a missed name change and a simple typo