Some class naming clean up and standardized loggging.