Italian to English Tech/Engineering Engineering (general)

I need your help! I'm translating a long catalogue for a producer of automation systems. In this catalogue, the Italian word "finecorsa" appears an infinity of times. Sometimes it refers to a "finecorsa elettronica", which the client wants translated as "limit switch", sometimes to a "finecorsa meccanica", translated as "limit stop". So far so good. My problem is this. Very often it is not clear from the context which type of "finecorsa" is involved in the particular product or product function. Obviously in Italian this is fine as the same word can be used in both situations. In English though, I would have to put either "switch" or "stop". Unless I can find an alternative which can be used "promiscuously" for either, just like in the Italian. Does anyone have any ideas? Thanks for your suggestions, Sarah.