Builder: rename targets to simplify build script front-end and make it more cli friendly