Fix class naming, Namespace in particular was really screwy.