Better naming and some refactoring for Plume connect cb