renaming things so they make more sense