minor changes to naming