Fixed a few naming errors in Decoder, decoder not apparently functional yet