Rename ITGCatchMessage
Cleanup