More renames and type checks: misc fixes