Fix wrong namespace in CleanUpListener