Changed static lib names to follow target names