Get rid of old version thing
Update to new names from compiler module