Shutdown handler + minor renames