Removed capitalized names for targets because it is too annoying