[PATCH] cleanup of in-code names