Updated for new-style logic names