Fix function names.
Change to 16bit