Refactor: extract methods findBasePropertyName and findSubPropertyName from makeList, and clean up logic using them.