Fix for new names