Fixes some naming snafus in the scaffold generator and deps