adding apigen target, cleaning up other target aliases