:lipstick: Rename poorly named things