Refactor cleanup to normalize naming in ioflo raet salt