Fixed disconnecting issue and changes to naming convention.