rename & organize some lemmas