Add err check, rename make targets.