fix #3: Issue3 - Fix legacy names left in the tests