Move fixes for name change