refactor prop names