Further iCodeHandler renames