Rename targets. Update to build using oxygen. Change-Id: I779c1eba8395d9442a907d503f3947f015a23a07 Signed-off-by: Greg Watson <g.watson@computer.org>