A nontrivial refactor

Update, so the lack of a "name" field in v0.9.0 doesn't break berkshelf via ridley.