fixed property and method name conflicts