Renamed properies which was required from last commit