revert to old naming convention