more prop name fixes