Update to naming and script logging.