rename property and functon to be in line with common names