adding logic to deal with old naming convention