minor revision to naming