Changed terminal_ to terminal - removed the old ones