migrate to the new naming convention