Rename, small fixes