Clean up notification name references