slight naming convention change