fixes for name change