Renamed private types to unexported