Remove Z80-specific names