Fixes for new name