change to naming convention