Renamed some property to fit according its function