rename and added build for other targets