Fixes to bugs from renamings