added more possibilities for property naming