Fixed naming scheme, fixed bad disconnect.