Fixes for name change bugs