some common sense renaming