Capitalize the constant names.
Rewrite some of the connection functions.