Switch framework name to something better?