Renamed targets for cross project consistency