A few renames.
A few style fixes in an unused fifo implementation.