Fixing consistency on names