Yes, that's more like it, Phil.
In similar vein (and as I have indicated before), how about:-
1) Check and Clean
2) Replace and/or Repair
3) Tighten and Lubricate
4) Adjust and/or Calibrate... as easy as 1-2-3-4!

Also, don't forget
TLC. That is:- tighten, lube, clean!
Meanwhile, forget ECRI, Jandre. For "generic" stuff it's always better to come up with your own (simple) designations.