clean up the definitions for hosting and estate a little.