Remove more-underscore, add Functoids