Updates after review - change originating parameter and names