Genericize

Mostly rename units and forms to be more generic.