fixing some names
added sentinel to type conversions