Fix for new naming scheme