slight changes to naming for clarity