Adding additional reserved names
Correcting type renaming during the override process