Rename, make properties