Move alternative propery name logic to util module