Cleared up naming conventions, some reorginization for clarity.