Rename more instances of isExpanding to active