Various type and capitalization changes