target name fix, a bit cleanup