TASK KSP-1943: Needed to rename to match connection