Updated specs to new top-level namespace