Fixing name incompatibility