mass rename to clarify logic separation