Fixing up some naming, added missing dep