minor changes to naming structure