Rename class, more checks.