Capitalized typedef and re-typed private member
merge shit