Enforcing name consistency