Fixes for name changes