Fixed some minor issues with legacy names.