naming improvements for shut down hook