Name changes and some checks.