Major rename to match veewee definitions