Fixed #214, Fix properties naming on develop branch