move everything to use _type instead of type