Fixes for new names