Updated some type names to use name_t format and be more descriptive