Moved pic16 naming functions to correct place.