missed name changes

also missing import