Name logic consistency

Review by @adriaanm