changed name of inline functor models (now separate with "_" as opposed to "-")